Showing clayton github
Merge branch 'master' of https://github.com/Glorious-Game-Design-ASL/MapQuizGame

Conflicts:
	client/src/js/app.js