Choose Search and Choose Sort Works
Merge branch 'master' of https://github.com/ISPGroup/Term-Project

Conflicts:
	DataBaseApp$1.class
	DataBaseApp$2.class
	DataBaseApp$3.class
	DataBaseApp$4.class
	DataBaseApp.class
	DataBaseApp.java
	RecordManager.class