fixed profile display issue
tiny box working-ish
Merge branch 'master' into helen
Merge pull request #45 from stuycs-ml7-projects/helen

Helen
Merge branch 'master' into oliver