Added firts class: Trap

Added trap base class with a derived class and a main
Merge remote-tracking branch 'origin/master' into HuanBranch

Conflicts:
	RogueLike/Debug/RogueLike.pdb
	RogueLike/RogueLike.sdf
	RogueLike/RogueLike.v12.suo
	RogueLike/RogueLike/Debug/RogueLike.log
	RogueLike/RogueLike/Debug/RogueLike.tlog/CL.read.1.tlog
	RogueLike/RogueLike/Debug/RogueLike.tlog/CL.write.1.tlog
	RogueLike/RogueLike/Debug/RogueLike.tlog/RogueLike.lastbuildstate
	RogueLike/RogueLike/Debug/RogueLike.tlog/cl.command.1.tlog
	RogueLike/RogueLike/Debug/RogueLike.tlog/link.command.1.tlog
	RogueLike/RogueLike/Debug/RogueLike.tlog/link.read.1.tlog
	RogueLike/RogueLike/Debug/RogueLike.tlog/link.write.1.tlog
	RogueLike/RogueLike/Debug/vc120.idb
	RogueLike/RogueLike/Debug/vc120.pdb
	RogueLike/RogueLike/RogueLike.vcxproj
	RogueLike/RogueLike/RogueLike.vcxproj.filters