added y
addyy
merge 1
Merge pull request #4 from jaduffy007/master

please merge
Merge branch 'master' of https://github.com/ikitha/conflict_test

Conflicts:
	methods.rb