Merge branch 'master' of github.com:SixArm/sixarm_ruby_ramp