fixed design pattern
fixed merge
Merge branch 'master' of https://github.com/Tadimsky/vooga