initial messy commit
Merge pull request #1 from marinamarina/dev

initial messy commit