something
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1
got the picture
Merge branch 'Richard' of https://github.com/OnTheSpotTeam/OnTheSpot1
adding experience working
map still not working
test
Merge branch 'master' of https://github.com/OnTheSpotTeam/OnTheSpot1
into Richard

Conflicts:
	src/com/swat/onthespot/ItinMapFragment.java