attempting a new pull request
fix conflict sebastian student page add sebastian css
Merge branch 'master' of github.com:jongrover/challenge-2