Add files via upload

diff --git a/README.md b/README.md
index 30bbb28..2faf92e 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,29 @@
-# Pokemon-Go-Rocket-API
-<<<<<<< HEAD
-![alt tag](https://github.com/Sen66/Pokemon-Go-Rocket-API/blob/master/screenshot.jpg)
-=======
-![alt tag](https://github.com/Sen66/Pokemon-Go-Rocket-API/blob/master/img.jpg)
->>>>>>> origin/master
-
-A Pokemon Go bot in C#
-
-## Features
-* PTC Login / Google
-* Get Map Objects and Inventory
-* Search for gyms/pokestops/spawns
-* Farm pokestops
-* Farm all pokemons in neighbourhood
-* Evolve pokemons
-* Transfer pokemons
-* Auto recycle not needed items
-* Output level and needed XP for levelup
-
-## Getting Started
-
-Go to PokemonGo\RocketAPI\Console\App.config -> Edit the Settings you like -> Build and Run (CTRL+F5)
-
-## Transfer Types
-
-The most popular option is probably the duplicate type that removes all duplicates and leaves you one pokemon of each type with the highest CP.
-
-* none - disables transferring
-* cp - transfers all pokemon below the CP threshold in the app.config, EXCEPT for those types specified in program.cs in TransferAllWeakPokemon
-* leaveStrongest - transfers all but the highest CP pokemon of each type SPECIFIED IN program.cs in TransferAllButStrongestUnwantedPokemon (those that aren't specified are untouched)
-* duplicate - same as above but for all pokemon (no need to specify type)
-* all - transfers all pokemon
+# Pokemon-Go-Rocket-API
+![alt tag](https://github.com/Sen66/Pokemon-Go-Rocket-API/blob/master/screenshot.jpg)
+
+A Pokemon Go bot in C#
+
+## Features
+* PTC Login / Google
+* Get Map Objects and Inventory
+* Search for gyms/pokestops/spawns
+* Farm pokestops
+* Farm all pokemons in neighbourhood
+* Evolve pokemons
+* Transfer pokemons
+* Auto recycle not needed items
+* Output level and needed XP for levelup
+
+## Getting Started
+
+Go to PokemonGo\RocketAPI\Console\App.config -> Edit the Settings you like -> Build and Run (CTRL+F5)
+
+## Transfer Types
+
+The most popular option is probably the duplicate type that removes all duplicates and leaves you one pokemon of each type with the highest CP.
+
+* none - disables transferring
+* cp - transfers all pokemon below the CP threshold in the app.config, EXCEPT for those types specified in program.cs in TransferAllWeakPokemon
+* leaveStrongest - transfers all but the highest CP pokemon of each type SPECIFIED IN program.cs in TransferAllButStrongestUnwantedPokemon (those that aren't specified are untouched)
+* duplicate - same as above but for all pokemon (no need to specify type)
+* all - transfers all pokemon
diff --git a/img.jpg b/img.jpg
index b5d421f..eca72db 100644
Binary files a/img.jpg and b/img.jpg differ