Cleaned up and reorganized code
More clean up
Merge branch 'master' of https://github.com/Kitane/mhmch-prototype

Conflicts:
	.gitignore