Merge branch 'master' into project_2
Bugfix on DatalogProgram datastructure
WIP: Project 3 complete, needs bugfixes
Bugfix on DatalogProgram datastructure
urgent buxfix
Bugfix: Frickin iterators
Optimize ALL the things
Merge branch 'master' of github.com:schnauzer/byu-cs236

Conflicts:
	project_1/datalogprogram.cpp
Merge branch 'project_2'

Conflicts:
	project_1/datalogprogram.cpp
	project_1/datalogprogram.h