initial commit
changed pic
Merge branch 'master' into gh-pages