rewrote user model methods
added before_filter to SiteController
made slight change to user.rb
testing changes to user.rb
fixed routes and some user.rb, moved methods from SiteController to UsersController
resolving conflicts
Merge branch 'master' into data_delivery
replaced UsersController with ConnectionsController
moved methods from user.rb to connections.rb
replaced oauth route and restructured ConnectionsController methods
fixed/renamed methods in Connections ctrlr & model
improved connection.rb methods
fixed methods for Connections and instituted them in controller
cleaned up connection.rb
Merge pull request #11 from melodicodyssey/data_delivery

Data delivery
Merge branch 'master' into contacts
fixed errors in connection.rb
Merge pull request #12 from melodicodyssey/data_delivery

fixed errors in connection.rb
adding resources and minor connection name change
Merge branch 'master' into contacts