Finished adding devise functionality.
Merged master, resolved conflict in application.html.erb
Merge pull request #4 from maureena/devise

Finished adding devise functionality.