Implemented Blimp Boss and Merged with Upstream
Adam Clark, Josh Zavala, Nick Stanley - Assignment 3

*Created 3 phase boss
*Added tilemap
*Update miscellanous spritesheets and classes
Implemented Blimp Boss and Airbase Map

Andrew Bellinder - Tilemap
Nick Strub & Brett Barger - Boss
Updated Airbase tilemap
Made quite a few changes as well as Added Assignment 3 :
-Game Object Manager
	Added "CreateBoss()" method

-Boss_TwinJetBullet
	Added class to handle standard gun fire from Twin Jet

-Twin Jet
	An enemy that the Manager handles, acts as part of the boss the player will fight

-debugFont
	A nice little sprite font class great for printing values to the screen
	for debugging

-BossFlightPattern
	Added class that holds flight patterns for the Twin Jet class

-Boss_TwinJetMissile
	The missile that the Twin Jet Boss fires. Homes in on the player

-TwinJetManager
	Class that acts as the main boss, maintains two jets (TwinJet enemy) and their
	introduction

-HomingMissileProjectile
	missiles now rotate with their velocity, projectile now implemented properly

-JetMinion
	Fixed bug where minion would "stick" to a fixed position away  from player and
	never attack
*Added Lavabug, Lavabug2, Mandible, and Photon classes

*Cleaned up code in previously written classes
Merge remote-tracking branch 'Nathan/master'

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/ScrollingShooter.csproj.Debug.cachefile
	ScrollingShooter/ScrollingShooter/ScrollingShooterGame.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/ResolveAssemblyReference.cache
Merged with trunk
*Modified Photon logic
suo hates me
Merge branch 'master' of https://github.com/zombiepaladin/scrolling-shooter

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/Enemies/Panzer.cs
	ScrollingShooter/ScrollingShooter/ScrollingShooterGame.cs
	ScrollingShooter/ScrollingShooter/Shields/EightBallShield.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/ResolveAssemblyReference.cache
	ScrollingShooter/ScrollingShooterContent/ScrollingShooterContent.contentproj
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ScrollingShooter/ScrollingShooter/Enemies/BladeSpinner.cs
	ScrollingShooter/ScrollingShooter/Enemies/Cobalt.cs
	ScrollingShooter/ScrollingShooter/Enemies/Drill.cs
	ScrollingShooter/ScrollingShooter/Enemies/JetMinion.cs
	ScrollingShooter/ScrollingShooter/Enemies/Seed.cs
	ScrollingShooter/ScrollingShooter/Enemies/StdBaddy.cs
	ScrollingShooter/ScrollingShooter/Enemies/beamShip.cs
	ScrollingShooter/ScrollingShooter/Projectiles/ToPlayerBullet.cs
	ScrollingShooter/ScrollingShooter/ScrollingShooterGame.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/ResolveAssemblyReference.cache
	ScrollingShooter/ScrollingShooterContent/ScrollingShooterContent.contentproj
	ScrollingShooterContentPipeline/TilemapContent.cs
Merge branch 'master' of https://github.com/zombiepaladin/scrolling-shooter
Updating the commit
Update commit
Updated lavaLevel2.txm
Made some adjustments to the boss and boss manager classes, removed my testing logic from the main game class, and adjusting the homing missile timer in the player ship class

~Nick Boen
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ScrollingShooter/ScrollingShooter/Bosses/Boss.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ScrollingShooter/ScrollingShooterContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Pushing my resolved merges back into my fork

Merge branch 'master' of https://github.com/zombiepaladin/scrolling-shooter

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/Bosses/Boss.cs
	ScrollingShooter/ScrollingShooter/Enemies/JetMinion.cs
	ScrollingShooter/ScrollingShooter/GameObjects/GameObjectManager.cs
	ScrollingShooter/ScrollingShooter/Projectiles/Projectile.cs
	ScrollingShooter/ScrollingShooter/ScrollingShooter.csproj
	ScrollingShooter/ScrollingShooter/ScrollingShooter.csproj.Debug.cachefile
	ScrollingShooter/ScrollingShooter/ScrollingShooterGame.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/ResolveAssemblyReference.cache
	ScrollingShooter/ScrollingShooterContent/ScrollingShooterContent.contentproj
	ScrollingShooter/ScrollingShooterContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Added shotgunTimer for the shotgunPowerup