merge
Merge branch 'master' of github.com:outcastagency/atmos

Conflicts:
	tpl/layout.jade