Merge branch 'master' of https://github.com/bioforensics/MicroHapDB

LICENSE.txt

@@ -1,11 +1,15 @@
-Copyright (c) 2018, Battelle National Biodefense Institute (BNBI);
-all rights reserved. Authored by Daniel Standage.
+Copyright (c) 2018, DHS.
 
 This Software was prepared for the Department of Homeland Security
 (DHS) by the Battelle National Biodefense Institute, LLC (BNBI) as
 part of contract HSHQDC-15-C-00064 to manage and operate the National
 Biodefense Analysis and Countermeasures Center (NBACC), a Federally
-Funded Research and Development Center.
+Funded Research and Development Center. All rights in the computer
+software are reserved by DHS on behalf of the United States Government
+and the Contractor as provided in the Contract. NEITHER THE GOVERNMENT
+NOR BNBI MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY
+LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this
+sentence must appear on any copies of this computer software.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are