yep
Merge branch 'master' of
https://github.com/lukaaaaaaaay/Programming-2---Assignment-2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.