some char_x's and char_y's tried to stick around
Tidied up bullet
Commit to fix (hopeful) merge error
Merge branch 'master' of github.com:Epiphane/7DRL_2013

Conflicts:
	main.lua
Head being a bitch
Just remaking my main.lua file...