marge
Merge branch 'master' of github.com:dtak1114/rubycamp2013.setting
bullets.andrifactaring.

Conflicts:
	lib/pants.rb