Exercise 2
Merge branch 'master' of https://github.com/speedyray/ruby_intro

Conflicts:
	modulo.rb
Exercise_2