merge aws and github
Merge branch 'master' of https://github.com/tianfanw/TwittMap