finish post new tweet
resolve merge conflict on index page
Merge pull request #4 from zagadooga/dannyg

Dannyg