Fiddled
Merge branch 'controller' of github.com:GOAAAT/tuningcomplete into controller

Conflicts:
	app/app.ls
	app/wire.ls
Fiddles