this is from ipython notebook
Merge branch 'master' of https://github.com/PyLadiesTaiwan20140920/TestGit
 Please enter the commit message for your changes. Lines starting
finnal deleted
Merge branch 'master' of https://github.com/PyLadiesTaiwan20140920/TestGit