commented out administrator_factory.rb
changes
user tests
started setting up session/login
Merge branch 'users' of https://github.com/ChloeStinetorf/oceanic into users
added code to session/displays login link
configuring layout
Merge branch 'users' of github.com:ChloeStinetorf/oceanic into users
nav bar mostly working
added login form
Merge branch 'users' of https://github.com/ChloeStinetorf/oceanic into users
session tests passing!
fixes
fixed merge
register and cancel tests
added registration form
Merge branch 'users' of https://github.com/ChloeStinetorf/oceanic into users
user or admin can login -complete