Minor changes
Merge branch 'master' of github.com:joeycozza/lab4

Conflicts:
	Database.cpp
	RuleInterpretation.cpp