dumb commit
Merge branch 'master' of https://github.com/Borzen/CIS563

Conflicts:
	MP2/CIS562.sdf
	MP2/ipch/mp2-f719c2b9/mp2-cca0cdbb.ipch
updated code and fixed some problems.