Merge branch 'michael' into dev
Merge branche 'michael' into dev - second try
Location merged
Location merged - second try
Location merged - third try
Merge branch 'dev' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into dev