First Michigan Mainstrea Commit
Merge branch 'master' of https://github.com/Cixtian/MiMS

Conflicts:
	README.md