fixing merge problem
Merge branch 'master' of https://github.com/polenzdakota/SJSU-CS160-160ZAIBATSU

Conflicts:
	Hoardr/MagicDB/Updated_Table/hoardruptodatetables.mwb
	Hoardr/MagicDB/Updated_Table/hoardruptodatetables.mwb.bak
updated table