New Controllers
Merge branch 'master' of https://github.com/Arctangent1759/SocialAlarm

Conflicts:
	SocialAlarm/Gemfile.lock
	SocialAlarm/config/routes.rb
added controllers