latest
Merge branch 'master' of https://github.com/ISPGroup/Term-Project

sorry i kind of accidentally fainted from lack of sleep
Conflicts:
	BarGraph.class
	DataBaseApp$1.class
	DataBaseApp$2.class
	DataBaseApp.class
	DataBaseApp.java
	DataBaseApp.java~
	RecordManager$1.class
	RecordManager$2.class
	RecordManager$3.class
	RecordManager$4.class
	RecordManager.class
	RecordManager.java~