new file:   ruby/MegaGreeter.rb
Merge branch 'master' of https://github.com/bruceSz/learnToexcellent

Conflicts:
	ruby/MegaGreeter.rb

	new file:   java/simple-code/CalculatePrimes.java
	new file:   java/simple-code/SimpleCache.java
	new file:   java/simple-code/TenThreads.java
	new file:   java/simple-code/TwoThreads.java
	new file:   java/simple-code/nio_multithread.java
	new file:   python/api-tester/performance_test.py
	modified:   ruby/MegaGreeter.rb
	new file:   ruby/koans/.path_progress
	new file:   ruby/koans/GREED_RULES.txt
	new file:   ruby/koans/README.rdoc
	new file:   ruby/koans/Rakefile
	new file:   ruby/koans/about_array_assignment.rb
	new file:   ruby/koans/about_arrays.rb
	new file:   ruby/koans/about_asserts.rb
	new file:   ruby/koans/about_blocks.rb
	new file:   ruby/koans/about_class_methods.rb
	new file:   ruby/koans/about_classes.rb
	new file:   ruby/koans/about_constants.rb
	new file:   ruby/koans/about_control_statements.rb
	new file:   ruby/koans/about_dice_project.rb
	new file:   ruby/koans/about_exceptions.rb
	new file:   ruby/koans/about_extra_credit.rb
	new file:   ruby/koans/about_hashes.rb
	new file:   ruby/koans/about_inheritance.rb
	new file:   ruby/koans/about_iteration.rb
	new file:   ruby/koans/about_java_interop.rb
	new file:   ruby/koans/about_keyword_arguments.rb
	new file:   ruby/koans/about_message_passing.rb
	new file:   ruby/koans/about_methods.rb
	new file:   ruby/koans/about_modules.rb
	new file:   ruby/koans/about_nil.rb
	new file:   ruby/koans/about_objects.rb
	new file:   ruby/koans/about_open_classes.rb
	new file:   ruby/koans/about_proxy_object_project.rb
	new file:   ruby/koans/about_regular_expressions.rb
	new file:   ruby/koans/about_sandwich_code.rb
	new file:   ruby/koans/about_scope.rb
	new file:   ruby/koans/about_scoring_project.rb
	new file:   ruby/koans/about_strings.rb
	new file:   ruby/koans/about_symbols.rb
	new file:   ruby/koans/about_to_str.rb
	new file:   ruby/koans/about_triangle_project.rb
	new file:   ruby/koans/about_triangle_project_2.rb
	new file:   ruby/koans/about_true_and_false.rb
	new file:   ruby/koans/about_variable_scope.rb
	new file:   ruby/koans/example_file.txt
	new file:   ruby/koans/koans.watchr
	new file:   ruby/koans/neo.rb
	new file:   ruby/koans/path_to_enlightenment.rb
	new file:   ruby/koans/triangle.rb