first commit
Merge https://github.com/lpitre95/dazz