Fixed underscores, Demo now works
Merge branch 'master' into megan
Changed some variables and fixed some camel case
Added a function to player context