more collision stuff and basic non-functional jump code
Merge branch 'master' of github.com:Jesse-calkin/GGJ2014