Map edits
.
Merge branch 'master' of https://github.com/iordan93/Team-Eranikus

Conflicts:
	Team-Eranikus-Game-Project/WorldOfASCIITanks/GameObjects/World/Items/Weapons/Knife.cs
	Team-Eranikus-Game-Project/WorldOfASCIITanks/GameObjects/World/Movable/NPC.cs
	Team-Eranikus-Game-Project/WorldOfASCIITanks/Program.cs