templating
Merge branch 'master' of https://github.com/jessmchang/stride-center

Conflicts:
	templates/base.html