added stuff
merge conflict
new pic
Merge branch 'master' into gh-pages
merge conflict
fixed pic