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 #1 from marshawjs/marsha-reid

Marsha reid
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
add marsha to index
css code
update bio
another update to bio and css addtions
complete css and upate photo
improvement
picture updated
Merge pull request #56 from DeRizzio/floyd-derizzio

Floyd derizzio
add floyd to index
Merge pull request #55 from marshawjs/master

finished profile page
update photo, html, css
Merge pull request #57 from marshawjs/marsha-reid

Marsha reid congratulations!