Merge branch 'master' of github.com:autosquid/autosquid.github.com