Merge branch 'iss132' of https://github.com/Sadye/PokeGOAPI-Java into Sadye-iss132

# Conflicts:
#	src/main/java/com/pokegoapi/api/map/Map.java
#	src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java

Style issues

Author: Grover-c13

src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java

@@ -266,7 +266,8 @@ public CatchResult catchPokemon(double normalizedHitPosition,
 				break;
 			}
 			numThrows++;
-		} while (amount < 0 || numThrows < amount);
+		}
+		while (amount < 0 || numThrows < amount);
 
 		api.getInventories().updateInventories();