Pre-"Geo Pull" commit / wish me luck
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise

Conflicts:
	WarInParadise/source/Entities/Entity/AI/Mafia.cpp
	WarInParadise/source/Entities/Entity/Player.cpp
	WarInParadise/source/Entities/Static/Weapon/AssaultRifle.cpp
	WarInParadise/source/Game States/GameplayState.cpp
Merge branch 'master' of https://github.com/dadamitskiy/WarInParadise