TEST
Merge branch 'master' of https://github.com/cproctor/hackGMS

Conflicts:
	README.md