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

Conflicts:
	source/.DS_Store