error fix
Revert "Sword spawns 1 per floor with stats proportional to floor#"
Merge pull request #152 from Birdbrain2/revert-151-master

Revert "Sword spawns 1 per floor with stats proportional to floor#"
Equip Infrasture added
Merge pull request #153 from EnacheB/master

Equip Infrasture added
error fix?
Revert "All equipable item types implemented"

This reverts commit 2a17ece5d7167bacbb2300ce88a731dcccbd77fc.
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#
Balancing, Astral Projection follows player
Merge branch 'master' of https://github.com/Birdbrain2/Rougue
Revert "error fix?"

This reverts commit 3782f8307142a410afcf082cf290b4d25ef95fbe.
Revert "Revert "error fix?""

This reverts commit ddda98aafcbbfd96bc3bbacdf362cedeb47fa54c.
Weapon spawn
Merge pull request #157 from duiker2/master

Sword spawns 1 per floor with stats proportional to floor#
Items that you can equip are now added

swords, helmets, armor, necklaces
Merge pull request #158 from verbiage/master

Items that you can equip are now added
Merge pull request #155 from John5025/master

Balancing, Astral Projection follows player
Tiles change appropriately when going up