Barrel fix
Rats working
Merge branch 'master' of github.com:Epiphane/7DRL_2013

Conflicts:
	enemies.lua