+ridge. change functions.
change

Merge branch 'master' of github.com:yz224/521final

Conflicts:
	summary