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
Renaming image
Automatically updating the calendar
Adding in matts mug
Merge branch 'master' of github.com:html5rocks/www.html5rocks.com