Merge pull request #4 from framgia/master

Master
Merge branch 'develop' of github.com:framgia/framgia_os
Merge branch 'master' of github.com:framgia/framgia_os
Done game
Merge pull request #17 from bs90/master

Master