Don't pull yet
broken chosen
Merge branch 'master' of github.com:trappist/rewardrocket

Conflicts:
	app/views/home/products.haml
Merge branch 'master' of github.com:trappist/rewardrocket