test
added return value to getChannels and reorganized code
can list channels that user has
fixed format of app.js
fixed conflicts
minor bug fixes
adding checks to channels controller
Merge branch 'next-happy' into next-alex
fixed merge conflicts and channels list is working
linked to channels from channels list
getChannels now accepts a fourth argument (telling whether to get posts or not, true or false)
getPosts now is a subset of getChannels
going to the dashboard (aka home) now gives you a working (though unformatted) copy of all your posts from all your channels
bug fixes
fixed merge conflicts
Merge branch 'next-happy' into next-will
Cleaned up code a little bit
fixed small bug with channels.js
added return value to getChannels and reorganized code
can list channels that user has
minor bug fixes
adding checks to channels controller