login1
Merge branch 'master' of https://github.com/jacobcmurphy/whatsgoingon

Conflicts:
	Gemfile
	Gemfile.lock