Search : fixed
Merge remote-tracking branch 'origin/France'

Conflicts:
	Tweet-Tea-GUI/src/org/tweet_tea/model/TwitterAPI.java
Merge branch 'master' of https://github.com/GlasgowCaley/ErasmusTwitterApp

Conflicts:
	Tweet-Tea-GUI/bin/org/tweet_tea/model/TwitterAPI.class