first changes
Merge pull request #1 from dcgudeman/master

first changes
Merge branch 'master' of https://github.com/ikitha/conflict_test

Conflicts:
	methods.rb