conflict resolution
bg color
whohoo
html reset
html change
error resolution
add floats
lots of push
merge
Merge branch 'matt' into katie
merger 5