added player and keyboard classes, tried to get player movement working along with basic input
trying to fix merge conflicts