stuff
Merge branch 'master' of https://github.com/mattschofield/travel-hub-manch

Conflicts:
	public/javascripts/mapper.js
	views/index.jade