update
Merge branch 'master' of https://github.com/chscodecamp/web102
updated styling
added div
Merge branch 'master' of https://github.com/bcgossett/web102.git
changed js function
Merge branch 'bcgossett-master'
Fixing merge conflict