forget what added
Merge branch 'master' of https://github.com/winaboy/2014AmazonHackathon into mainline