goalProgress changed to optional
Merge branch 'master' of github.com:ImanMh/goalProgress