first commit
Merge https://github.com/irinamagdici/test-doopal