Temporary commit for player, merging together code 3/20/2013
Fixed conflicts, committing for good measure