updated logo to match fixed gh-pages
merging brnaches
merge conflict first use of vimdiff
free floating images
New header file settup, and wider page
Merge pull request #8 from CrouseMatthew/Matthew

Matthew
Merge branch 'master' into gh-pages