added devise and users
added cancan to user model
navbar
Episode audio db, controller, model
Finish user auth and navbar
Resolve conflicts
resolved conflicts
Resolve conflict in routes
Add logo
Update edit user profile route
Finish user/program relationship
functional saving of episode format. no comments about bobbys cats. WIP:adding actual image, accessing audio files
fixed conflicts
integrated paperclip to add image files with upload
Finish CRUD program/categories/host
Resolve merge conflicts
Resolve merge conflicts
Resolve merge conflicts
Resolve merge conflicts
design WIP