images show up
Merge branch 'master' of https://github.com/JamesRen/GetThere

Conflicts:
	getthere/routes/upload.js