fixed merge conflicts
Merge branch 'master' of github.com:giovannic/hack13