conf file
Merge branch 'master' of https://github.com/rdp/sensible-cinema