committing changes before pulling Dan's changes
fixed merge conflict
merging Dan't changes
layout and styling updates
css altered
fixed Luisa's merge conflicts