heroku prep
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/app.js
	public/partials/home.html