the best
Merge branch 'master' of https://github.com/khanh111/scoutapp2014

Conflicts:
	views/partials/pit.jade