.
Merge branch 'master' of https://github.com/lucponnau/Gatech-Events

Conflicts:
	gatech-events-web/app/views/eventMap.scala.html