created custom list adapter

xml file, adapter class, and holder class, as well as implemented it
into the list fragment
stilll working on the adapter

sigh
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?
working on app flow

giving the journey fragment a journey to add photos to
???

??
??

this workspace file is a pain
Merge remote-tracking branch 'origin/part4'

Conflicts:
	ass2/.idea/workspace.xml
	ass2/out/production/ass2/ass2.apk
	ass2/out/production/ass2/com/example/Journey/actJourney.class
	ass2/out/production/ass2/com/example/Journey/fragJourney$1.class
	ass2/out/production/ass2/com/example/Journey/fragJourney$2.class
	ass2/out/production/ass2/com/example/Journey/fragJourney.class
	ass2/src/com/example/Journey/actJourney.java
	ass2/src/com/example/Journey/fragJourney.java
edited some general stuff

just making stuff neater
slideshow xml

starting to work on the slideshow
slideshow settings

added and filled the spinners with times and titles + an "all journeys"
title
ughh

ugh
merge?
Merge remote-tracking branch 'origin/part3'

Conflicts:
	ass2/.idea/workspace.xml
	ass2/src/com/example/Journey/fragJourney.java
why

why
woorkspace
DB stuff

was supposed to be in part 2, oops
merge?
added context menu to list with view/delete options

ugh still working in the wrong branch somehow. git WHY.