hello to everybody
Merge branch 'master' of https://github.com/PyLadiesTaiwan20140920/TestGit

Conflicts:
	hello.py
Merge branch 'master' of https://github.com/PyLadiesTaiwan20140920/TestGit
Merge branch 'master' of https://github.com/PyLadiesTaiwan20140920/TestGit