1
Merge branch 'master' of https://github.com/zeemil/regate.git
Structuré comme dans le shéma de classes
commit
Commit
Merge branch 'master' of https://github.com/zeemil/regate

Conflicts:
	Regate/src/Demo.java