Combat formula tweaks

And other subtle changes
Trying to ignore some useless files.
Create .gitignore
Merge branch 'master' of https://github.com/ConcordUniversityMath240/FinalProject
dumb stuff
I don't even know man.
Uploading gary's stuff
Merge branch 'Andy' 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
	roguelike/object.h
	roguelike/player.h
Merging Gary's stuff.
Merge branch 'Gary2' of https://github.com/ConcordUniversityMath240/FinalProject.git

Conflicts:
	roguelike/bin/Debug/main.exe
	roguelike/main.layout
	roguelike/obj/Debug/main.o
Merge branch 'HEAD' of https://github.com/ConcordUniversityMath240/FinalProject.git

Conflicts:
	roguelike/main.layout
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
	roguelike/player.h
Github thinks it can outsmart me...
Updating this to the version Ioan displayed today.
added comments and deleted some stuff we did not need