Fixes bugs
Merge branch 'master' of https://github.com/Ra1nWarden/HowHardCanYouMug

Conflicts:
	js/html_actuator.js