Merge branch 'master' of https://github.com/cballenar/base12

Conflicts:
	README.md
Merge branch 'master' of https://github.com/cballenar/base12

Arghhh