Working?
Working code
Merge branch 'master' of https://github.com/Borzen/CIS563

Conflicts:
	MP2/CIS562.sdf
	MP2/MP4/MP4.vcxproj
	MP2/MP4/MP4.vcxproj.filters
	MP2/ipch/mp2-c8b6b898/mp2-cca0cdbb.ipch