conclusion og småting
Merge branch 'master' of https://github.com/cyborbob/aDS