changed last line of intro text
changed the last line
changed the last line
Merge branch 'master' of https://github.com/kfarr2/team_dynamics

Conflicts:
	team_dynamics/templates/tdapp/database.html
Ignore the collectstatic directory