error fix
error fix?
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Prefabs/Combat/sword 1.prefab
	Assets/Scripts/Map Generation/TileMap/MakeMap.cs
Merge branch 'master' of https://github.com/Birdbrain2/Rougue
Merge pull request #154 from duiker2/master

Sword spawns 1 per floor with stats proportional to floor#