Commit b4 merge
Merge branch 'master' of https://github.com/Epiphane/7DRL_2013
Commit befoar merge
Merge branch 'master' of https://github.com/Epiphane/7DRL_2013
Added spike traps
Merge branch 'master' of https://github.com/Epiphane/7DRL_2013

Conflicts:
	enemies.lua