Stuff.
Merge branch 'master' of https://github.com/wasabii/BitMaker

Conflicts:
	.gitignore