merge beginners and technique calendars into one group
Merge branch 'master' into gh-pages
simplified calendar