bug fix
Merge branch 'jonathan' of github.com-jonathanwangmit:aehsu/pentimento into jonathan
refactored code to follow new MVC design