Pre merge
Post merge
Merge branch 'matt' of https://github.com/JoyP/z-chaser
Added burgers
Modified player