Homework 2 grade
Homework 2/3 corrections
Merge branch 'master' of https://github.com/chengjason/homework

Conflicts:
	hw3.js