naturalJoin done
Merge
Merge branch 'master' of https://github.com/njchristian/315_RDBMS

Conflicts:
	Database.cpp
Update fixed
Update fixed
Update fixed
Update fixed
Update fixed
Merge branch 'master' of https://github.com/njchristian/315_RDBMS

Conflicts:
	Database.h
	Relation.cpp