class edit
Re-arrange method in class
Merge branch 'master' of https://github.com/it57070078/theatre