Added dropdown
Merge branch 'master' of github.com:richardtbell/tweetfeet

Conflicts:
	assets/javascripts/mapFunctions.js
	views/index.slim