adds docker back
Merge branch 'master' into complete
fixes stylesheet
Merge branch 'master' into complete