Contributing

At long last... merged dev upstream minutes ago, resolved conflicts in db/schema.rb. Also pushed to heroku for viewing if you would like to check it out. http://odin-develop.herokuapp.com/contributing