Completed first half portion of Task 1
Merge branch 'master' of github.com:cjlarose/web-assg1
Merge branch 'master' of github.com:cjlarose/web-assg1