commiting before merging master back into this apparently
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/static/js/services.js
All calls to the http service now in services instead of the controllers directly
Merge pull request #52 from CombustibleLemons/devon-milestone-4B

Http calls now exclusively in services.js