add dooooooog file
3rd test3rd test3rd test
1st
2nd2nd
Merge branch 'testing'

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