fixed routes
changed model associations (?)
more refactoring
started writing tests for user model (all fail, mystery problem with creating User object for tests
merge