First commit to move to FlashPunk
Resolving conflicts in merge
Adding constants to player