first setup added files to gitignore
added wp-config and robots as they change by branch
added to gitignore
added gitignore
added missing files
added files from development server
changed config settings
config changed
Merge branch 'development' into staging

Conflicts:
	.gitignore
	robots.txt
	wp-config.php
changed config
changed project files
added function for if esi elements dont excist
Merge branch 'staging' into development
added check for if esi elementer don't excists
added categories and tags to pages
changed
Merge branch 'staging'