Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
	stylesheets/styles.css
Finish news blog design and coding