please fucking work
Merge branch 'master' of https://github.com/mantone/hollywoodhackathon

* 'master' of https://github.com/mantone/hollywoodhackathon:
  more logic