First attempt to update my branch
Merge branch 'master' of github.com:vccalhoun14/advanced-css-layout into victoriabranch

Merging our work at 10:50am.