delete
Merge branch 'master' of https://github.com/andreyguk/pf2.git

Conflicts:
	src/main/java/com/di/pf/dao/test.java