Fri Apr 27 2018 12:37:32 GMT-0700 (Pacific Daylight Time)

LICENSE.md

@@ -2,11 +2,18 @@
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/).
 =======
 This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
 >>>>>>> 0cbe07ba09667c914fecd5bba51b2a9d6a939c54
+=======
+This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
+=======
+This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/).
+>>>>>>> 787df2934c3f78e0cf29efd70380c93a6e6dbf3a
+>>>>>>> b30dddbe713e91a6fb6a04e9a5aaf7ab741f6405
 
 ### You are free to:
 
@@ -30,7 +37,14 @@ You do not have to comply with the license for elements of the material in the p
 
 No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 This PDF was generated using Prince (https://www.princexml.com/).
 >>>>>>> 0cbe07ba09667c914fecd5bba51b2a9d6a939c54
+=======
+
+This PDF was generated using Prince (https://www.princexml.com/).
+=======
+>>>>>>> 787df2934c3f78e0cf29efd70380c93a6e6dbf3a
+>>>>>>> b30dddbe713e91a6fb6a04e9a5aaf7ab741f6405

manifest.json

@@ -630,6 +630,7 @@
 		"36-07",
 		"36-08",
 		"36-10",
-		"36-13"
+		"36-13",
+		"01-01"
 	]
 }