new file:   Gemfile
new file:   README.md
new file:   dsv.rb
new file:   system_config_sample.yml
new file:   whippy_cmd.rb
Merge branch 'master' of https://github.com/koh1/system_ctrl_cli

Conflicts:
	Gemfile
	dsv.rb

modified:   dsv.rb