commit b4 merge lol
Merge branch 'master' of https://github.com/Epiphane/7DRL_2013

Conflicts:
	main.lua