trying to resolve merge conflict
Merge branch 'master' of https://github.com/bhahm/PingU-Android

Conflicts:
	Android Project Workspace/res/layout/activity_maps_and__pinging.xml