This is a test to commit file
To add new file defMethod.py
Modify HelloPython.py

I made some changes in HelloPython.py in test brach
Modify HelloPython.py in master brach

Just to test made changes for one file in different brach
This time it was modified in master brach
Merge branch 'test'

Conflicts:
	HelloPython.py

Merge files between master and test brach

I merged HelloPython.py between master and test brach by keeping all their
changes
Merge branch 'master' of https://github.com/flowlsj/python