executed grunt server:dist command
grunt server:dist command executed
Merge branch 'master' of https://github.com/SweetPixel/SweetPixelStudios
anchor error removed
conflict removed
main.js deleted
testing