downloading sean's edits
fixed merge
finished styling
finished styling
minor fixes
finished styling
fixed merge