Updated DatabaseHandler
Merge branch 'gerard'

Conflicts:
	src/com/example/aad2project/model/DatabaseHandler.java