todo commit
Merge branch 'develop-redo' of https://github.com/dpostigo/ThoughtFlow into develop-redo