Ajout d'une activité et modif de plusieurs trucs

Signed-off-by: Lois47 <collet.lois@gmail.com>
Merge branch 'master' of https://github.com/kazamafury/GangnamStyleTheGame

Conflicts:
	AndroidManifest.xml
	res/layout/jeu.xml
	res/values/strings.xml
	src/com/example/gangnamstyleproject/MainActivity.java

Signed-off-by: Lois47 <collet.lois@gmail.com>