bio for marsha
merge conflicts
Merge branch 'master' of https://github.com/jongrover/challenge-2 into marsha-reid
attempting a new pull request
Merge pull request #54 from marshawjs/marsha-reid

Marsha reid
fix conflict sebastian student page add sebastian css
Merge branch 'master' of github.com:jongrover/challenge-2