merge remote
Merge branch 'master' of https://github.com/Stevej4/my_koans

Conflicts:
	.path_progress
	about_proxy_object_project.rb
fixed and finished