user can log in with github
Merge branch 'master' of github.com:SamSamskies/codereviewplease

Conflicts:
	Gemfile
	Gemfile.lock