merging resolved conflicts
merged
merged
full news feed
merged alec's branch
merging with danny
commit for pull request
fixed index page
added button to feature in layout
Merge branch 'master' into alec
Merge pull request #8 from zagadooga/dannyg

Dannyg
Merge pull request #9 from zagadooga/master

Created button to feature in layout
Merge branch 'master' into alec
finished news feed algorithm
Merge branch 'alec' of https://github.com/zagadooga/lil_twitter into alec
merged
Merge pull request #10 from zagadooga/alec

Alec
merged
Merge pull request #11 from zagadooga/Austin

Austin
added author_id column to tweets table, updated create new tweet to populate this with the tweet author