encore le gui
Merge branch 'master' into pilou

Conflicts:
	src/net/sourceforge/jetris/JetrisMainFrame.java
Merge commit '569bf8aebabd2aed1ac041cbaed92159869e7226'
Merge pull request #11 from Warrows/master

merge gui