Made the directional magic attack "longer"

Increased the distance for the directional magic attack.
Combat class created

Now when player initiates melee combat, it happens in combat class
instead of player class. Still need to implement this for Enemy melee
combat, as well as player directional magic combat.
Inventory/Items and the Boss
Combat class updated

Combat class now enables actively attacking enemies, and holds the
directional attack method instead of player.
Merge branch 'Andy' of https://github.com/ConcordUniversityMath240/FinalProject.git

Conflicts:
	roguelike/bin/Debug/main.exe
	roguelike/enemy.h
	roguelike/game.h
	roguelike/main.depend
	roguelike/main.layout
	roguelike/obj/Debug/main.o
	roguelike/player.h
Fixed a bug with enemy attacks
Fixing merge
Fixing Merge?
Merge branch corrections
Merge Fixes continued.
Final Merge Fix...or is it?
-
Merge branch 'ioan' of https://github.com/ConcordUniversityMath240/FinalProject.git

Conflicts:
	roguelike/bin/Debug/main.exe
	roguelike/game.h
	roguelike/main.depend
	roguelike/main.layout
	roguelike/obj/Debug/main.o
Merging Ioans stuff.
fixed database