edit to OOP fashion
resolve conflict
Merge branch 'master' of https://github.com/Alex0216/dinnerplanner-swing