Challenge 1 & 2
Merge branch 'master' of https://github.com/drbjones/essential_ruby

Conflicts:
	challenge_1.rb
	challenge_2.rb