Compiled with grunt
Merge pull request #2 from thebrianzeng/master

Compiled with grunt