did more of the tutorial
Merge branch 'master' of https://github.com/dlknowles/melonjstut