Pull request
Handling conflicts
Heroku commit
Pull request
Merge branch 'master' of github.com:PqBenoit/ptp

Conflicts:
	app/assets/javascripts/home.js