adding test_file
first commit from testing branch
adding exercise 5
adding changes to test_file
really commiting changes to master this time
Merge branch 'testing'

Conflicts:
	test_file