First commit
Merge branch 'master' of https://github.com/lamarrap/learningjs

Conflicts:
	README.md
Initial commit