Unsure
Merge branch 'master' of https://github.com/daneb/koans

Conflicts:
	.path_progress
Worked on Regex