Merge branch 'master' into gh-pages
ignore file
Merge branch 'gh-pages'
I know AngularJS --Neo