Merge

merged evan's edits, created game and player