after error checking
Merge branch 'master' of github.com:john316/cs677_lab3

Conflicts:
	database.py