modified:   ruby/koans/.path_progress
	modified:   ruby/koans/about_hashes.rb
	ruby/koans/.about_hashes.rb.swp
Merge branch 'master' of https://github.com/bruceSz/learnToexcellent

Conflicts:
	ruby/koans/.path_progress
	ruby/koans/about_hashes.rb

	modified:   ruby/koans/.path_progress
	modified:   ruby/koans/about_hashes.rb
	modified:   ruby/koans/about_regular_expressions.rb
	modified:   ruby/koans/about_strings.rb
	modified:   ruby/koans/about_symbols.rb
	new file:   ruby/koans/test