Removed some pages
Merge branch 'master' of github.com:DavidRedden/organ

Conflicts:
	app/controllers/newsfeed_controller.rb
Merged master into heroku fully.