Merge pull request #12 from hollocherDale/gh-pages

updated comments in html
removed conflict text
modified siebar images
added text to sidebar images and moved index image to html with text
Merge pull request #13 from hollocherDale/sidebar_text

added text to sidebar images and moved index image to html with text
changed collapsed navbar color
made content titles bold
added media queries
changed links list style
moved everything up a level
Merge pull request #14 from hollocherDale/master

Merge with master