Database class is done, Block/Order class update
Merge branch 'Jimmie'

Conflicts:
	TimeManagement/src/com/example/timemanagement/model/Block.java
Minor change
Ignoring .orig files