commit merge
fixed merge conflicts
Merge branch 'master' of github.com:snebel/wdi_project_2