Exercise 1 again
Merge branch 'master' of https://github.com/cindyspence/mmc3260-s14-exercises

Conflicts:
	1-html-quick-fix.html