Commit non test
Merge branch 'master' of https://github.com/Quentigus/24hDuCode2014
Merge branch 'master' of https://github.com/Quentigus/24hDuCode2014

Conflicts:
	src/fr/titouz/gamewatch/emulateur/controller/ControlController.java
Correction du README.