Automatically updating the calendar
add CSS Shapes article; ref #1145
Merge branch 'master' into shapes

Conflicts:
	database/tutorials.yaml
Merge pull request #1220 from oslego/shapes

Add CSS Shapes article
Merge pull request #1221 from html5rocks/master

Merging CSS Shapes to live.