javascript slides
Merge branch 'master' of https://github.com/abramhindle/CMPUT404-Javascript-Slides

Conflicts:
	README.md