Updating HTML and CSS with 5 vs 4 column at beginning.
Again -Merge branch 'master' of https://github.com/susansmith/HTML-CSS-V2

Conflicts:
	README.md
	css/.DS_Store
	css/main.css
	css/normalize.css
	images/.DS_Store
	images/udacity-mug.png
	index.html
	js/.DS_Store
	js/jquery-1.11.1.min.js