gmaps
Merge branch 'master' of github.com:neonsamurai/events into add-twitter-hashtag-data

Conflicts:
	client/index.html
	client/index.js
Adds google maps api
adds twitter template stub