Parsing 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	FizzBuzz.rb
Parsing 3