Edited html
Merge branch 'master' of https://github.com/shannontan94/tbpsite

Conflicts:
	templates/candidates.html