form stuff
Merge branch 'master' of https://github.com/khalua/travlr
fixed trips_users table
merge conflicts