added some content, not checked, nothing final yet
Merge branch 'master' of github.com:drderkummer/Software-Engineering-Project