unbroke
Merge branches 'master' and 'master' of https://github.com/camerongray1515/ilwhack2014

Conflicts:
	map/templates/map.html
	static_files/js/filtered.js