added gems
github authentication
added gems
Merge branch 'master' into github_auth

Conflicts:
	app/controllers/users_controller.rb
Github auth