indented js files, but there is a syntx error in one of the js files...
Merge branch 'master' of github.com:zealotjin/learn