Final push
Merge branch 'master' of github.com:eduardobritosan/prct08

Conflicts:
	lib/exam/orange.rb
Merge branch 'master' of github.com:eduardobritosan/prct08