CSS styling final
photo conflict
Merge branch 'master' of github.com:makersacademy/student-directory