pulling
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into slideshow_view
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into slideshow_view
pulling
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into cleanup
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into cleanup
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into cleanup
moved routes out of home controller into media controller
Merge pull request #101 from dbcfoxes2014/cleanup

Cleanup