sln
Merge branch 'master' of https://github.com/Cellmon95/WarGames

Conflicts:
	core/Assets.cs