removed the class User from roadtrip.py (it was already in bb.py)
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL

Conflicts:
	white-terra-413/roadtrip.py