Charlie Summarizing

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

Conflicts:
	frontend/index.html
Test

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