progress
Merge branch 'refactoring' of github.com:GreenZest/cinema into refactoring