attempt to revert
Merge branch 'oauth' of github.com:catfriend/Portfolio into oauth

Conflicts:
	Gemfile.lock
added comments
finished adding facebook login option with oauth