Changed my scenario.
Merge branch 'master' of https://github.com/chrisw8094/Weise_Christopher_WPF

Conflicts:
Functions_Personal/js/script.js
Merge branch 'master' of https://github.com/chrisw8094/Weise_Christopher_WPF