updating readme
Merge branch 'gh-pages'
removing favicon.png
fixing conflict in readme