Added fade in animation
got modal working
Merge branch 'master' of https://github.com/nsthi/horchata

Conflicts:
	app/assets/javascripts/application.js