move to html
all the squares
Merge branch 'branch/nate' of https://github.com/mightyhops/nulam into andrewJadeJS
Merged. Removed public/js.
Merge branch 'master' into branch/Geoff