Weapons spawn 1 per floor
Merge pull request #147 from ygong10/master

xp bar
Original art for spell cooldown icons
All equipable item types implemented

swords, helmets, armor, necklace
Merge pull request #148 from verbiage/master

All equipable item types implemented
Weapons Spawn with stats proportional to floor
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Scripts/Map Generation/TileMap/MakeMap.cs
	Assets/Testing.unity
Merge pull request #151 from duiker2/master

Sword spawns 1 per floor with stats proportional to floor#
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