Merge branch 'master' into go-version
Merge branch 'go-version' of github.com:Sergunis/pomodoro_flow into go-version