user now sees own picture on profile page
a touch o' style
Merge branch 'master' of https://github.com/elizabrock/coursewareofthefuture into jerry
User may now see instructor and class roster pictures on the 'Peers tab'
added additional files for testing list of pictures
Merge branch 'master' into dev

* master:
  Users see course navigation when viewing profiles
  Fix: "add new event" button should not be visible for non-instructors
  Instructors now view courses index by default.
  Bump other outdated gems
  Bumpe Rails
  Students should be able to update their pictures from their profile page.
  Instructor views course as student
  Correct code coverage! Woo!
  Fix location of code coverage token.
  Refactor application to use CanCan for authorization
  Properly render images and non-markdown content.

Conflicts:
	app/views/enrollments/index.html.haml
	app/views/users/show.html.haml
Fixup testing for profile images
Spiff up styling/layout for profile images
Merge pull request #6 from elizabrock/dev

Dev