REALLY fixed starting locations now
Merge branch 'master' of git://github.com/FlorianOosterhof/tue-2io23