Updated gems
Merge branch 'admin' of github.com:OffTempo/offtempoV4 into admin
Merge branch 'master' into admin
Removed the "sign up" feature
Installed bcrypt
Removed ActiveAdmin (starting anew)
Removed devise (to start anew)
Reinstalled ActiveAdmin with Devise setup.
Removed hand-coded login page, /login route, and disabled comments for ActiveAdmin
Merge branch 'news' into admin

Conflicts:
	db/schema.rb