storing local changes
added .DS_Store and db .DS_store to gitignore
resolved routes conflict
Merge branch 'master' of https://github.com/project-camelback/camelback-rails into piazza-integration
add instructor attribute to assignment model.  add logic to populate that attr via email_processor