Housekeeping
Merge branch 'master' of https://github.com/mksanderson/beaker

Conflicts:
	.gitignore
	source/.DS_Store
	source/fonts/.DS_Store