Primer commit
Merge branch 'master' of https://github.com/laurapons/napbuf_test

initial merge between local and remote branches