Added map tips
Merge conflicts
git pull
Added map tip and merged with Gellerts code