added smiley :)
Merge branch 'gh-pages'
remove smiley :(
Merge branch 'master' into gh-pages