progress.., calendar rework
Merge branch 'master' of github.com:booncon/fighting-club