bootstraping
Merge branch 'master' of github.com:gindyo/jasmin

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/checkout.css.sass
added some js