add whereami
Merge branch 'master' of https://github.com/Poupotte/digidisk-setup
Merge branch 'master' of https://github.com/Poupotte/digidisk-setup
merge conflict
merge conflict