js changes and further styling
fixed bug where trips weren't associated with users
Merge branch 'master' into further-styling
reverting js changes to working version
quick typo
removing unnecessary methods in user model
Merge pull request #30 from lilkraftwerk/further-styling

Further styling, fixing bugs associating trips with users