added module2 user2
Merge branch 'master' into user1

Conflicts:
	testFile.txt