made trip object and implemented it in tripActivity
added trip object to the project
adapters are now ready layouts have had ID's changed for the better.
added comments
changed again
changed comments again
adding comments
Merge branch 'james'

Conflicts:
	src/com/drexel/septaplanner/myData.java
adding septa viewer app to project
Merge remote-tracking branch 'origin/mike' into mike

Conflicts:
	res/layout/activity_main.xml
Merge branch 'master' into mike