collision once again
Merge branch 'master' of https://github.com/Glord/TripFri