fixed augmentation
mergeø
git commit -m merge
Merge branch 'master' of https://github.com/Bladtman242/sigb2013.2