data activity
data activity update1
merge dev joanna
merge dev and joanna
merge dev and joanna2
data activity
data activity v.1
data activity merge
data activity refresh etc.
merge finished
Merge branch 'michael' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into michael