another push
dude
new stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	log/development.log
new stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/products_controller.rb
	app/views/products/show.html.haml
	app/views/stores/show.html.haml
	log/development.log
committing new changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb
	log/development.log
Update README.md
updating the latest and coolest changes
Merge pull request #20 from genenettles2/master

The Best Changes Ever
 Commit before pull
fix conflicts