adventure finished
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL

Conflicts:
	white-terra-413/roadtrip.py
commit
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL
ajout amis fonctionne