changes
changes
Merge branch 'master' of https://github.com/Math273Project/SuperMarioBros

Conflicts:
	SuperMarioBros/SuperMarioBros/SuperMarioBros.vcxproj
	SuperMarioBros/SuperMarioBros/SuperMarioBros.vcxproj.filters
chekcout
Merge
WinMain
Winmain
object.cpp
Merge
changes
Merge branch 'master' of https://github.com/Math273Project/SuperMarioBros

Conflicts:
	SuperMarioBros/SuperMarioBros/Arena.h
	SuperMarioBros/SuperMarioBros/Graphics.h
	SuperMarioBros/SuperMarioBros/Mario.cpp
	SuperMarioBros/SuperMarioBros/Object.cpp
	SuperMarioBros/SuperMarioBros/Object.h
	SuperMarioBros/SuperMarioBros/WinMain.cpp
copyand paste