commit
Merge branch 'master' of https://github.com/ikishik/parra-shop.com

Conflicts:
	app/assets/stylesheets/application.css.scss