sjgjohnston: Adding users, items, sessions and locations base controllers and associated files, and setting routes in routes.rb
Fix merge conflicts