Fixing merge mistakes.
Asking fora commit again, even though i didn't do anything.
Create bugs.txt

It begins.
Updated bug .txt file

Added some current and fixed bugs
haha
Merge branch 'Andy2' of https://github.com/ConcordUniversityMath240/FinalProject.git

Conflicts:
	roguelike/bin/Debug/main.exe
	roguelike/game.h
	roguelike/main.depend
	roguelike/main.layout
	roguelike/map.h
	roguelike/obj/Debug/main.o
	roguelike/object.h
Layout again...
Merge branch 'candyx' of https://github.com/ConcordUniversityMath240/FinalProject.git

Conflicts:
	roguelike/interface.h
	roguelike/main.layout
Bleh
This should be the first version of Merge 2.
Merge 2 Cleanup:
 - Split off Player and Enemy classes into seperate headers.
 - Made the stairs yellow.
 - Level now increments when a player levels up.
 - Comments, etc.
lil tweak
layout
Merge branch 'ioan' of https://github.com/ConcordUniversityMath240/FinalProject.git
Also changed the stairs to arrows.
GARBAGE
Merge branch 'cuervo' of https://github.com/ConcordUniversityMath240/FinalProject.git
TOTALLY FIXED THE INVINCIBLE ENEMY BUG GUYS
Adding the healthbar.
Healthbar attempt #2.
Added real time movement in game; updated Ai