CRUD a host to a program
CRUD a single host to a program
Merge Master into Users branch
Merge remote-tracking branch 'origin/master' into users
CRUD hosts and host permission
CRD Episodes
Add date and time to episodes
posting episodes added
CRUD episodes
episodes done
CRUD categories and show their programs
more static page controller work
moar tests
first attempt at unborking 10,000 merge conflicts. Schema, controllers, models, and views all modified to fit problems.
finish first cherry pick merge conflict
finish second cherry pick with episode model resolving merge conflicts and missing files
finish third round of cherry picking commit and resolving conflict to merge users into master branch
forth cherry pick fix for users branch finished
fifth cherry pick to settle borkings for merge conflicts
got proper display/playback for player. deleted unnecesary autogenerated files. refactored homepage. created partials being used in other branches.