catch up

q
git add test1.rb

:x
:q
Merge branch 'master' of github.com:smilinpiggy/pcs_021113