to pull
Merge branch 'master' of https://github.com/KernelCorp/team_days

Conflicts:
	app/assets/javascripts/partners.js.coffee
#td-8 work 8h
Merge remote-tracking branch 'origin/master'