Merging Player class
Merge branch 'master' of https://github.com/milescj/cs194
Merging Player class
Merging Player class
Camera Movement
camera movement