yoan
Merge branch 'master' of https://github.com/Callilol/tracker

Conflicts:
	app/assets/javascripts/application.js
	app/views/home/index.html.haml