local commit to solve conflict
Merge branch 'master' of https://github.com/aerobless/ToxicTodo.git
first version of FontIconButton that takes an icon from awesome font