Merge pull request #54 from dbcfoxes2014/media_routes

Media routes
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into media_routes