devise session management
merge conflicts
Lots of changes to site layout + user sessions / accounts