update DB stuff

made it so the activity has the main reference to the db, and opens and
closes it. the fragments will just get the db ref from the activity when
they start
Merge remote-tracking branch 'origin/part2'

Conflicts:
	ass2/.idea/workspace.xml
	ass2/src/com/example/Journey/fragList.java
Merge remote-tracking branch 'origin/part4'

Conflicts:
	ass2/.idea/workspace.xml
	ass2/src/com/example/Journey/fragJourney.java
	ass2/src/com/example/Journey/fragList.java
fixed the list :)

was missing like two lines of code in the database code, so this maybe
should have been in the part 2 branch, but who even knows how to git?