edit salsa.rb & calc_salsa.rb
add test.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.rb