Kirby 1 notice
Merge branch 'master' of git://github.com/matthewspencer/kirby-twig-plugin into kirby-2

Conflicts:
	README.md