????
Merge branch 'master' of https://github.com/5wooley4/html5-automaton-gui

Conflicts:
	lib/menu.js