Mechanic
Merge branch 'master' of https://github.com/whostolemyhat/feb-1gam

Conflicts:
	.gitignore