Merge pull request #5 from devosvictor/dev

Copy layout from previous project merge
abort
Merge branch 'dev'
Merge pull request #6 from devosvictor/dev

just get things normal again
Merge branch 'dev'
Merge branch 'master' of https://github.com/devosvictor/meditateAPP