Began new test for displaying tweets
Fixed merge conflicts
Re-added gitignore