finish intro
Merge branch 'master' of https://github.com/qgeffard/enclos.git

Conflicts:
	src/com/enclos/ui/Enclos.java
Merge branch 'master' of https://github.com/qgeffard/enclos.git
change size init