fixing as many tests as possible
search works
Change Topic update to perform feeds update after the rest of the update, fixes #93
Merge pull request #105 from CombustibleLemons/fix-for-issue-93

Change Topic update to perform feeds update after the rest of the update, fixes @93
no more api prompt on registration page
no more api prompt on registration page
Merge branch 'master' of github.com:CombustibleLemons/rss-reader
fixed lots of tests in test_auth_api, tests_feed_post, tests_user_api
added postgres setup script to rss reader folder
Added a postDate string to the end of post headers, set defaults for sorting
Merge pull request #108 from CombustibleLemons/lucia_README

Lucia readme
Merge pull request #107 from CombustibleLemons/style-bugs

Added a postDate string to the end of post headers, set defaults for sor...
Update README.md
resolved merge conflicts
merge conflicts resolved
typo
Merge pull request #106 from CombustibleLemons/jawwad-shenanigans

Jawwad shenanigans
Merge branch 'master' of https://github.com/CombustibleLemons/rss-reader into michelle-scrolling

Conflicts:
	rss_reader/templates/index.html