before push
Merge branch 'feature/class' of https://github.com/CE-KMITL-OOAD-2014/POS4Shop into feature/class