Es
Merge branch 'master' of https://github.com/griffitha/AaronAshleyAlexRogueLike

Conflicts:
	item.cpp
	itemh.h