clustering & pierre
Merge branch 'master' of https://github.com/TweetAggregator/TweetAggregator
clustering+pierre