add test7
Merge branch 'test7-editing'

Conflicts:
	src/TestApplications/Controllers/EnterController.java