Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit f63c1bd05503e87055021808bdbf27bf5532f66e.
Merge branch 'proba' into HEAD

Conflicts:
	error.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	init.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	init.rb