ommit message: fixed some AI problems added enemy generation in rooms.
merge message: I don't even know why I'm merging anymore but git is making me do it anyway.
Merge branch 'master' of github.com:We-Have-Names-Actually/WSW

Conflicts:
	Spelunker/src/Wrapper.java
Message of this
Merge branch 'master' of github.com:We-Have-Names-Actually/WSW

Conflicts:
	Spelunker/res/rooms.txt
	Spelunker/src/Wrapper.java