Update oldData and retab app.js
Merge branch 'master' of github.com:willcrichton/mystro

Conflicts:
	www/data.js