merge
Merge branch 'master' of https://github.com/dmichiels/uContracts

Conflicts:
	condition.rb