FIXES
Merge branch 'master' of github.com:pechkin/faynahata

Conflicts:
	app/assets/javascripts/parallax_background.js