reuploading from office
Merge branch 'master' of https://github.com/jayzces/twitter_app

reuploading from the office
testing