updated app settings
Merge branch 'db' of https://github.com/lnhubbell/tweetTrack into db
refactored twitter_stream
updating changes
fixing merge conflicts
fixing merge conflicts
Merge branch 'merge_branch'
Merge branch 'master' of https://github.com/lnhubbell/tweetTrack