Changed test.py on testing branch
Changed test.py in master
Merged test.py from testing branch
Fixed test.py
Made to test.py in testing3 branch
Changed test.py in testing branch
Updated README in master branch
Merge branch 'testing'

Conflicts:
	README