finishes crud for users and trips
updates bower.json, fixes merge conflict