fixed fucking keybindings
commit
taking out the trash
housecleaning
conflict will happen
Merge branch 'master' of https://github.com/timestep/mchammerbot

Conflicts:
	html/index.html