bugfix.
Merge branch 'master' of github.com:trueter/MyMoment