unimportant changes
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Scenes/Game.unity
Added volume. Fixed pausing issue.
Merge branch 'master' of https://github.com/elvap/Rougue into elvap-master

Conflicts:
	Assets/Scripts/Entities/Player/Player.cs
Merge branch 'elvap-master'
Items

Added item system and health potions (needs to be debugged, but the
item system itself is functional)

Inventory display (keycode I) has an issue with my background inventory
texture, and creates warnings
Merge pull request #77 from verbiage/master

Items
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Scenes/Game.unity
merge with master
Merge pull request #78 from duiker2/master

put enemies back in
"f" to fireball, "m" to place mine

AOE Projectiles/Traps
fireball/mine size change
Merge pull request #79 from John5025/master

"f" to fireball, "m" to place mine
Updating