Add 20140520note.
Merge branch 'master' of github.com:CHometeach/hw2

Conflicts:
	library
Merge branch 'master' of github.com:CHometeach/hw2

Conflicts:
	library