staging to be able to do a pull
Merge branch 'master' of https://github.com/ndrpntsgnm/rubyKoans

Conflicts:
	.path_progress
lunch time check in. working on proxy