almost finish user function.
Merge branch 'master' of https://github.com/CHometeach/hw2

Conflicts:
	library