jluria/filmr — pull request #14 by jluria (2014-08-14 20:57:08+00:00)
Title: Fix merge cruft

* Remove merge conflict cruft from talent's show
* Change movie's show
* Make movie's show and talent show look nicer