Chill
Merge branch 'master' of https://github.com/connortakata/teamsource

Conflicts:
	ProjectManagement/tasks.html