adds two methods
uncommented something
Manually merged Chris and tony's test whatever

Merge branch 'master' of https://github.com/tonyta/mergetest

Conflicts:
	merge.rb