Phase1_2 Test
Merge branch 'master' of https://github.com/Trigunale/ProjetTwitter2

Conflicts:
	src/dataMining/TwitterRecup.java
Merge branch 'master' of https://github.com/Trigunale/ProjetTwitter2

Conflicts:
	src/dataMining/TwitterRecup.java