create and update methods for channels
create and update methods for channels
Merge branch 'master' of https://github.com/devilshaircut/youstars into dtp/sep5

Conflicts:
	app/models/user.rb
Merge pull request #2 from devilshaircut/dtp/sep5

Dtp/sep5