Merge pull request #18 from jlrogee/dev

Dev to master
Merge branch 'master' of https://github.com/jlrogee/ipsilon into dev
layout
layout
layout title
Merge pull request #21 from jlrogee/task_layout

Task layout