updated logo to match fixed gh-pages
merging brnaches
merge conflict first use of vimdiff
free floating images