ignores
Merge commit '3184f134c74291f5b3fa32cf57984196cb49ed22'
set url for servlet performance test to cloudapp server, and lower cutoff time on regular performance test
Geolocation documentation
Merge branch 'master' into fun

Conflicts:
	(deleted) src/test/java/com/uber/challenge/foodtruck/hougaardj/FoodTruckPerformanceTest.java