git init
Merge branch 'master' of https://github.com/RanSolo/ruby_koans

Conflicts:
	koans/.path_progress