Added fade in animation
oauth fixed, added sign in with fb button
got modal working
Merge branch 'master' of https://github.com/nsthi/horchata

Conflicts:
	app/assets/javascripts/application.js
Changes happened
MErge conflict res