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

Conflicts:
	rss_reader/templates/index.html
adds queue but tries to access bad url
quit fucking with my clique
FIXED THE DAMN QUEUEFEEDS CREATION
Finished de-queue, queue problems
Removed feed settings
Merged with master
SURVIVED GIT MERGE AWFULNESS
Merge pull request #123 from CombustibleLemons/michelle-scrolling

AWFUL MERGE THAT TOOK FOREVER