works
Merge branch 'master' of github.com:petebrooks/exercism

Conflicts:
	ruby/accumulate/accumulate_test.rb
	ruby/binary/binary_test.rb
	ruby/grade-school/grade_school_test.rb
	ruby/sum-of-multiples/sum_of_multiples_test.rb
working school
school works