Fixing Null pointer exceptions on list locatio
merged
Geting loc
shit damn
Merge branch 'Reza3' into Victor

Conflicts:
	src/com/example/pickuplistapp/ListDisplayActivity.java
	src/com/example/pickuplistapp/Map.java
dying
Merge branch 'Reza3' into Victor

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Remove and add working
S
Merge branch 'Victor' into Reza3