Messed this thing up, didn't i..
Merge branch 'master' of https://github.com/MuseumTour/Zombit