Made some changes. Too tired to know what exactly. So yeah.
Merge branch 'master' of https://github.com/dtkelch/cis353

Conflicts:
	CIS353-project.sql