fixing bug n design
Merge branch 'master' of github.com:martin15/huaxua