finishes crud for users and trips
updates bower.json, fixes merge conflict
trips templates dones, not sure about css style sheets
update for bootstrap
Merge branch 'master' into trips_templates
WIP
fix merge conflicts
Merge branch 'master' into bootstrap
adds bootstrap