check
check
Deleted old files and added kirby 2 from scratch
All is working but home.php
Home: $articletop working
Moving around
Transition to kirby 2
updated .gitignore
Merge branch 'kirby-2'

Conflicts:
	.htaccess
	assets/.DS_Store
	site/.DS_Store
	site/templates/exhibition.php
	site/templates/home.php