added return value to getChannels and reorganized code
can list channels that user has
fixed conflicts