Merge remote-tracking branch 'origin/master'

Conflicts:
	Collision/Collision.layout
	Collision/bin/Debug/Collision.exe
	Collision/obj/Debug/main.o
	Collision/obj/Debug/src/Block.o