stuff

stuff
Merge branch 'character-design' of https://github.com/zolphinus/Team42Workspace into character-design

Conflicts:
	roguelike42/rogue42/rogue42.layout
Added New Classes and GenerateChar() Function

Made 2 new classes for the purpose of categorizing other classes.
Added X and Y position variables
junk
Merge