Fixed now hopefully the endless cycle bug from before...
merge
Merge branch 'master' of https://github.com/stnuessl/MobileComputingLab