test commit
Merge branch 'master' of git://github.com/brunerm/Building-Stuff into brunerm-master

Conflicts:
	README.md