Update package.json

fixing merge
testando heroku
Merge branch 'master' of https://github.com/carlosabs/bitstarter
merging index
adding ico