revert
Merge branch 'master' of https://github.com/2014WilsonWebmaster/TSA_Website

Conflicts:
	output.txt

fix issues: a non-important edit