nothing
Merge branch 'master' of
ssh://git@github.com/jonaslergell/takemethere.git

Conflicts:
	src/edu/chalmers/takemethere/LocationService.java
created new class LocationHandler