Created:
1) Shops
2) Checks
3) Coupons
update gitignore
Merge branch 'feature-new_sf' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
	log/development.log