Submitted the new main-files (most of the files migth not work yet)
Merge branch 'master' of github.com:dkissling/my_project