LALA
Merge branch 'master' of github.com:lmudvaynel/roll_up

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/index_script.js
	app/assets/stylesheets/pages.css.scss