This is a folder created by Joannie
Merge branch 'master' of https://github.com/PyLadiesTaiwan20140920/TestGit