Update master
Update testfile
Update testfile
Update awesomefile
Merge branch 'master' into new_func4

Conflicts:
	testfile