Add test.py file
Merge branch 'myfeature'
Update test.py file on the new branch testing
Update test.py file again on the testing branch
Repairing some files

Conflicts:
	polls/test.py
Complete tutorial part 3