Deploy to Heroku
Reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/styles/app.css
	app/styles/app.css