moved martina's stuff
Merge branch 'master' of https://github.com/celie56/si_206_group
reset header and css for now