Join a hub
Merge branch 'master' of https://github.com/jacques-gegout/hackathon-2013

Conflicts:
	tripForm.py