made new timeFunctions
changed map things
Merge branch 'master' of https://github.com/boontje1994/TIA4