I literally have no idea what I'm doing but it compiles now
Merge branch 'master' of github.com:svenstaro/gamejam