Merge branch 'Weber_Wk_1'

Conflicts: .gitignore