confusing placeholder removed
disregard this commit
Merge branch 'master' of https://github.com/britneyroar/twatter into Home_page

Updating local copy
Tweet feed fixed
fixed merge conflict
Merge pull request #13 from britneyroar/Home_page

Fixed merge conflicts