added method
Merge branch 'master' of https://github.com/echappen/git-practice

Conflicts:
	example.rb