conflict will happen
Merge branch 'master' of https://github.com/timestep/mchammerbot

Conflicts:
	html/index.html
made the base of controller
made accel slower
added drive/reverse var
made accel differ for drive/reverse
renamed
confict resolv