rollback
Merge branch 'master' of github.com:danijelas/shopper

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:danijelas/shopper
update