ACASSI200 | update with game with mac.
Merge branch 'Game' of https://github.com/Dregron/SpaceRaiders into Game

Conflicts:
	Alien Raider/.classpath
	Alien Raider/.settings/org.eclipse.jdt.core.prefs
	Alien Raider/src-main-space_battle/com/dregronprogram/boss/BossTypeOval.java
	Alien Raider/src-main-space_battle/com/dregronprogram/cache/ImageCache.java
	Alien Raider/src-main-space_battle/com/dregronprogram/debugger/ConsoleDebug.java
	Alien Raider/src-main-space_battle/com/dregronprogram/display/Display.java
	Alien Raider/src-main-space_battle/com/dregronprogram/enemy_bullets/EnemyBasicBullet.java
	Alien Raider/src-main-space_battle/com/dregronprogram/enemy_bullets/EnemyThreesixtyBullets.java
	Alien Raider/src-main-space_battle/com/dregronprogram/game_mode/Intro.java
	Alien Raider/src-main-space_battle/com/dregronprogram/game_mode/PlayerWeapons.java
	Alien Raider/src-main-space_battle/com/dregronprogram/game_mode/WeaponDetails.java
	Alien Raider/src-main-space_battle/com/dregronprogram/game_mode/player_bullets/Grenade.java
	Alien Raider/src-main-space_battle/com/dregronprogram/game_mode/player_bullets/Loose.java
	Alien Raider/src-main-space_battle/com/dregronprogram/game_mode/player_bullets/MachineGun.java
	Alien Raider/src-main-space_battle/com/dregronprogram/game_mode/player_bullets/PlayerWeaponType.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/CurrentLevel.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/GameLevel.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/GameOver.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/Level1.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/Level2.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/Level3.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/Level4.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/Level5.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/Level6.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/Level7.java
	Alien Raider/src-main-space_battle/com/dregronprogram/levels/LoadNextLevel.java
	Alien Raider/src-main-space_battle/com/dregronprogram/timer/FPSTimer.java