DON'T. USE. BACKSLASH N. ANYMORE. GOT
IT?????????????????????????????????????????????????????????
Merge branch 'master' of https://github.com/Epiphane/7DRL_2013

Conflicts:
	sidebar.lua