.
triplist
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidTeamF/src/main/java/teamf/controller/methods/getTripList.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidTeamF/src/main/java/teamf/controller/methods/getTripList.java
triplist