moved resources
deconflicted
Merge branch 'master' of github.com:ParkerKemp/Homeflix-Base
tweaks