merging resolved conflicts
merged
merged
full news feed
merged alec's branch
merging with danny
commit for pull request
fixed index page
finished news feed algorithm
merged
merged
Merge pull request #11 from zagadooga/Austin

Austin