Major bug fixes
Merge branch 'master' of https://github.com/dtkelch/CIS353

Conflicts:
	CIS353-project.sql