1st
Merge branch 'master' of github.com:jprudent/clobocode

Conflicts:
	LICENSE