solve merge conflict
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its

Conflicts:
	src/com/cse110team14/placeit/LocationService.java
merge resolved