Adding Jeff changes
Merge branch 'master' of github.com:eespinal/training-ruby

Conflicts:
	README.md