basics
Merge branch 'master' of https://github.com/ralle030583/mcDams
change around of files