Commenting

Commenting code and making minor changes
Merge branch 'master' of https://github.com/blueal/FRC-Team-1294

Conflicts:
	includes/footer.php