Merge pull request #63 from mouyang/codingstyle

semicolons
Merge pull request #62 from kate2753/master

Initial step to switch to grunt build process.