new commit
Merge branch 'master' of https://github.com/vvpalav/TweetMap.git

Conflicts:
	TweetPlottingOnMap/src/AwsCredentials.properties