moving the JS to the correct directory
listing channels (feeds)
Displaying Channels
commenting out unused labels
Merge branch 'step7'

Conflicts:
	commands/static/js/feed.js