V1 of input gathering, very simple
Merge branch 'master' of https://github.com/willcrichton/mystro

Conflicts:
	www/app.js