Merge branch 'master' of https://github.com/MareAtlantica/mareatlantica
Merge branch 'master' of https://github.com/MareAtlantica/mareatlantica
Update .gitignore
Merge branch 'master' of https://github.com/MareAtlantica/mareatlantica