fixed merge
fixed merge

Merge branch 'master' of github.com:dataknut/tweetDockerCon

# Conflicts:
#	README.md

dataknut/tweetDockerCon,dataknut/tweetR,dataknut/tweetDockerCon,dataknut/tweetR,dataknut/tweetDockerCon,dataknut/tweetR