first commit
Merge https://github.com/ElielHaouzi/NidApp