fix newline bug
Merge branch 'master' of https://github.com/burkean/gracefulcharity

Conflicts:
	gracefulcharity/templater.py