starting to fix formatting
Merge branch 'master' of https://github.com/willcrichton/mystro

Conflicts:
	www/js/data.js