s
Merge branch 'master' of https://github.com/tpham93/World_Of_Rectangle

Conflicts:
	World Of Rectangle/Maps/Castlemap.png
	World Of Rectangle/bin/x86/Debug/Maps/Castlemap.png