added a comment
change the comment
added new comment
Merge branch 'dark_sidebar'

Conflicts:
	style.css
updated version
I changed some styles (colour of navigation menu/ blackquote)