Prep for merge with develop branch
Merge branch 'develop' into Daniel
Removed unecessary comment controller functions
Fixed a bunch of rspec problems, 7 left
Fixed all spec issues by deleting comment rspec files
Prep for merge
Merge branch 'develop' into Daniel
Admins now have a page to view all the users
Merge branch 'Daniel' into develop