basic setup for photos and feeds
fix merge conflicts
Added basic authentication for PhotosAPI.  Connect and Callback routes for PhotosController.  Added table for FeedSources.
Fixed merge conflicts for merge of Trips into Staging
Merged updated Staging branch into Photos branch prior to pull request
Merge pull request #2 from bwinterling/photos

Adds basic authentication with Instagram API