require js
commint
Merge branch 'master' of https://github.com/anderszhang/JsPlayground

Conflicts:
	.gitignore