Finished merging animation branch

src/Blaze-Brigade/Blaze_Brigade/Blaze_Brigade.csproj.Debug.cachefile

-Content\charSprite.xnb
 Content\Game_Map.xnb
 Content\MenuImage.xnb
 Content\attackableNode.xnb
@@ -8,8 +7,8 @@ Content\items.xnb
 Content\move.xnb
 Content\wait.xnb
 Content\warrior_art.xnb
+Content\PixelFont.xnb
 Content\warrior_stats.xnb
 Content\Warrior_Info.xnb
-Content\PixelFont.xnb
 Content\PixelFontLarge.xnb
 Content\warrior.xnb

src/Blaze-Brigade/Blaze_Brigade/Game.cs

@@ -194,15 +194,9 @@ namespace Controller
                     // draws units for player 1
                     for (int i = 0; i < player1.getNumOfUnits(); i++)
                     {
-<<<<<<< HEAD
-                        Unit unit = player1.getUnits().ElementAt(i); // gets unit at i
-                        spriteBatch.Draw(unit.getSpriteImage(), unit.getPixelCoordinates(),
-                            null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f); // redraws char sprite
-=======
                         Unit unit = player1.getUnits().ElementAt(i); //gets unit at i
-                        spriteBatch.Draw(unit.getSpriteImage(), unit.getPixelCoordinates(), unit.getCurrentFrame(), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f); // redraws char sprite
->>>>>>> origin/Animation
-
+                        spriteBatch.Draw(unit.getSpriteImage(), unit.getPixelCoordinates(),
+                            unit.getCurrentFrame(), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f);
                     }
                     #endregion
 
@@ -282,8 +276,8 @@ namespace Controller
                     for (int i = 0; i < player2.getNumOfUnits(); i++)
                     {
                         Unit unit = player2.getUnits().ElementAt(i);
-                        spriteBatch.Draw(unit.getSpriteImage(), unit.getPixelCoordinates(), Color.White);
-                        
+                        spriteBatch.Draw(unit.getSpriteImage(), unit.getPixelCoordinates(),
+                            unit.getCurrentFrame(), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f);
                     }
                     #endregion