Completing feature f
Merge branch 'feature_f' into development
Adding test script
Merge branch 'test_script' into development
Merge branch 'development' into feature_e

Conflicts:
	app1/file1.txt