delete
Merge branch 'master' of https://github.com/DomKing/Exam

Conflicts:
	src/dao/ForTest.java