Commented out deprecated functions in controllers
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/static/js/controllers.js
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/static/js/controllers.js
Merge pull request #64 from CombustibleLemons/devon-milestone-4B

Commented out deprecated code, cleaned controllers.js in general