Arcade Machine port
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/Release/WarInParadise.log
	WarInParadise/Release/WarInParadise.tlog/CL.read.1.tlog
	WarInParadise/Release/WarInParadise.tlog/CL.write.1.tlog
	WarInParadise/Release/WarInParadise.tlog/WarInParadise.lastbuildstate
	WarInParadise/Release/WarInParadise.tlog/cl.command.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.command.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.read.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.write.1.tlog
	WarInParadise/Release/vc120.pdb
	WarInParadise/source/Entities/Entity/Player.h
	WarInParadise/source/Entities/Static/Weapon/Ranged.cpp

Pre-pull commit
Working on Tutorial
About to implement animations
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/Release/WarInParadise.log
	WarInParadise/Release/WarInParadise.tlog/CL.read.1.tlog
	WarInParadise/Release/WarInParadise.tlog/CL.write.1.tlog
	WarInParadise/Release/WarInParadise.tlog/WarInParadise.lastbuildstate
	WarInParadise/Release/WarInParadise.tlog/cl.command.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.command.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.read.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.write.1.tlog
	WarInParadise/Release/vc120.pdb
	WarInParadise/source/Entities/Entity/Player.cpp
	WarInParadise/source/Entities/Entity/Player.h
Hardcoded non-mission tutorial is in
Added both mouse and keyboard input to the game menus. Pause menu is only Menu without mouse input.
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/Options.txt
	WarInParadise/Slot1.xml
	WarInParadise/Slot2.xml
	WarInParadise/source/Game States/LoadSaveFileMenuState.cpp
Fixed on crash on death with no mission
Fixed Loading bug.
Pre pull commit
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/Release/WarInParadise.log
	WarInParadise/Release/WarInParadise.tlog/CL.read.1.tlog
	WarInParadise/Release/WarInParadise.tlog/CL.write.1.tlog
	WarInParadise/Release/WarInParadise.tlog/WarInParadise.lastbuildstate
	WarInParadise/Release/WarInParadise.tlog/cl.command.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.command.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.read.1.tlog
	WarInParadise/Release/WarInParadise.tlog/link.write.1.tlog
	WarInParadise/Release/vc120.pdb
	WarInParadise/Slot1.xml
	WarInParadise/resources/AnimationXml/PlayerAnimation.xml
	WarInParadise/source/Entities/Entity/Projectile/Bullet.cpp
	WarInParadise/source/Entities/Entity/Projectile/Bullet.h
	WarInParadise/source/Game States/GameplayState.cpp
prepush commit
Pre-Pull Merge, needs more boss functionality
Pre-pull commit
things n stuff
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/Release/WarInParadise.tlog/CL.read.1.tlog
	WarInParadise/Release/vc120.pdb
	WarInParadise/source/Game Core/Game.cpp
prepull merge, again. for spencer's build
Added Cover System, fixed up controls in menus, etc.
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/Options.txt
	WarInParadise/WarInParadise.vcxproj.filters
	WarInParadise/source/Game Core/Game.cpp
	WarInParadise/source/Game States/LoadSaveFileMenuState.cpp
	WarInParadise/source/Game States/LoadSaveFileMenuState.h
	WarInParadise/source/Game States/MainMenuState.cpp
	WarInParadise/source/Game States/OptionsMenuState.cpp
	WarInParadise/source/Game States/OptionsMenuState.h
	WarInParadise/source/Game States/PauseMenuState.cpp
Fixed up Arcade/Controller input in menus