added marker icons
Merge branch 'master' of github.com:drderkummer/Software-Engineering-Project
changed computerroom marker
Merge branch 'master' of github.com:drderkummer/Software-Engineering-Project