testing omniauth
working on user and project sorts
trying to merge john's changes
writing sort tests
stuff
stuff
merging in sort
committing latest pull
stuff
deadline type in model to date, and added a project model to return the date in slash format, then used that in the edit view
merging in deadline changes
saving changes to views
working on views
switching branches.
pulled
more pulling and merging
stuff
finished cucumber tests for sort. one problem with selecting the year for the date in the admin view, commented that step out, will figure out later
finished all cucumber and rspec tests for sort and new deadline type
sort is now case insensitive. fixed rspec tests according to changes made in controllers