projet properties
Merge branch 'master' of https://github.com/1ns4n3/Pokemon

Conflicts:
	src/main/java/fr/univaix/iut/pokebattle/run/PokemonMain.java
	src/main/resources/pikachu.properties
	src/main/resources/psykokwak.properties
	src/main/resources/salameche.properties
	src/main/resources/twitter4j.properties