added author_id column to tweets table, updated create new tweet to populate this with the tweet author
fixing merge conflicts on index page, controller
Merge pull request #14 from zagadooga/dannyg

Dannyg