add new_func4
Update testfile
Update testfile
Update new_func
Merge branch 'master' into new_func4

Conflicts:
	testfile
Merge pull request #5 from gal3/new_func4

add func4 into master