Training and education changes
Merge branch 'master' of https://github.com/TNRIS/site-mockup

Conflicts:
	content/markdown/training.md
	templates/training.html
Edited training spreadsheet, training page
Merge branch 'master' of https://github.com/TNRIS/site-mockup

Conflicts:
	content/training.csv