Lolchanges

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Merge remote-tracking branch 'remotes/origin/master'
c++ game of dooooom

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>