Commit
Merge branch 'master' of https://github.com/ecahill/CS2340

Conflicts:
	bin/classes/com/example/model/DatabaseHandler.class