Merge pull request #6 from Fidouda/fidouda

Add a simple tile system.
added level1
Merge branch 'master' of git://github.com/Fidouda/Majabaja
added a button play+quit
Merge pull request #8 from mamio/master

added a button play+quit + level1
Ajout du menu fonctionnel
Ajout d'un squelette de classe de barre de vie
Merge pull request #9 from benbonjour/master

Ajout du menu fonctionnel
added a pause State with resume button
Merge pull request #10 from mamio/master

added a pause State with resume button
Tile system completed
Merge branch 'master' into fidouda
Ajout d'une barre de vie et d'un niveau 2
crop music main menu
Merge pull request #11 from benbonjour/master

Ajout d'une barre de vie et d'un niveau 2
Arranger la camera
Merge branch 'master' into fidouda
Merge pull request #12 from mamio/master

crop music main menu
Arranger level2 de Ben
Merge conflict resolved