deployment updates
Merge branch 'master' of https://github.com/mdshw5/ballhead

Conflicts:
	ballhead/templates/results.html