test commit
another test commit
returning to original stage
inflated ee
configured EE permissions
configured EE database
trying to fix permissions
removed cache from git
updated gitignore
Merge branch 'develop' into staging

Conflicts:
	.gitignore
testing new templates
Merge branch 'develop' into staging
ignoring php templates for the moment
removing php templates from git
Merge branch 'develop' into staging
updated gitignore
updated gitignore
updated gitignore
updated config to be more dynamic
forgot to add config.php