Exercise 3 completed.
Merge branch 'master' of https://github.com/caitlinsinett/mmc3260-s14-exercises

Conflicts:
	3-html-wireframe.html