adding for merge
migrations table for adding twitter oauth tokens
adding for merge
resolving conflicts
Merge pull request #23 from andredempsey/nicole

Nicole