Merge pull request #1 from hchood/master

Take 99 Bottles
Update 99bottles.rb
Merge branch 'master' of https://github.com/ksavietta/test1 into kasavietta-master

Conflicts:
	99bottles.rb