initial commit
Merge https://github.com/wvandrunen/q42-assigment