put root first, specified ruby version in Gemfile
groups controller and switched authenticate_user out of application conrtoller and into all controllers execpt pages
Minor alterations to style
Manually approve merge conflicts with newgroup branch
Change Welcome landing page