removed unnecessary files in mergeCode
added battle, battlelog, and status files
Resolved errors/adapted merged code
Integrated merged classes, added check-in.txt, added PrefsManager
Removed a bunch of unnecessary files and duplicate code
Merge pull request #2 from MattMatt0240/master

merge latest code into test branch