Added test3
Removed Test2
Added Test5
Merge branch 'Branch2'

Conflicts:
	Test Project/main.java