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
Merged with json_data_handling