Player Merge

Merging Kyle's player classes and files to prepare for the UI elements.