Documentation, extraneous/defunct functions removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	COWS TV Display/includes/footer.html