Merge branch 'master' of https://github.com/christophsax/seasonal

Conflicts:
	README.md
Merge branch 'master' of https://github.com/christophsax/seasonal

Conflicts:
	README.md