* Elastic collisions between crates
Merge branch 'master' of https://github.com/stuartsoft/Rogue

Conflicts:
	guard.cpp
	rogue.cpp