Current Code

So the last commit from midterm only included 1 file for some reason, so
ignore that one. This is everything up to date plus some additions.
Merge branch 'master' of https://github.com/njr7/CASS

Conflicts:
	form2.php