i prolly put a space somewhere
erge branch 'master' into lucias_queuefeed_adventure
queuefeed tests and such
queuefeed models
queuefeed with static setting
queuefeed with qposts id list
dumb queuefeed tests pass
dumb queuefeed tests pass
removed old html examples
deleted a junk file?
reset to where all tests work except staticqueuefeed
read time working
Merge branch 'master' of https://github.com/CombustibleLemons/rss-reader into readspeed

trying to get read speed up to date.
both dumb and static queuefeed work
switched it to a controller
Merge pull request #70 from CombustibleLemons/readspeed

Readspeed
everything works some more with queuefeed, merged master
Merge pull request #72 from CombustibleLemons/lucias_willthiswork_jeez

Lucias willthiswork jeez
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/static/js/controllers.js