For
Merge branch 'master' of https://github.com/joaoluiznaufel/learning-ruby

Conflicts:
	basic/control.rb
For