Added stuff from prof
Merge branch 'master' of https://github.com/spudmonkey/CISP-1020

Conflicts:
	Date05/Date05Code.txt