New autoMap
Merge branch 'master' of https://github.com/McNice/Projekt1