testing json array data manipulation
Finally got JSON output, need to figure out appending map to JSON object, Edit BeerLocation to fit with json data
slight modifications to beerlocation.java and more testing of BeerJSON. ToDo: Determine if wrapper needed for BeerLocation -> JSON. Will write functions for BeerJSON tomorrow.
changed branch name
added rudimentary functionality for uesr stories 4-7
added output functionality to BeerJSON/Location
Added basic distance func and distanceDisp func.
Listview populated, Beer info displayed as string.
Edited Android Textview
Fixed beer location
Added placeholder actionbar functionality
Added up button functionality
Tests implemented for BeerLocation
Fixed up some tests
Implemented sorting and filtering methods
Merge branch 'TestBranchChris' into json_data_handling

Conflicts:
	asgn1/assigned_project/code/VandyBeer/src/com/example/vandybeer/BeerLocation.java
Added dialog boxes and delete to beer comment list.
Merged with json_data_handling
Added sorting and filtering functionality to the main activity
Added search functionality to the main activity