updated gitignore
Merge branch 'develop' into staging

Conflicts:
	.gitignore
Merge branch 'develop' into staging
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
adding database config back
added more dynamic variables to config
updated gitignore
Merge branch 'staging' into develop

Conflicts:
	system/expressionengine/config/config.php
updated database and config to be dynamic
edited gitignore
Merge branch 'staging' into develop

Conflicts:
	system/expressionengine/config/database.php
Merge branch 'staging'

Conflicts:
	system/expressionengine/config/config.php
	system/expressionengine/config/database.php
updated config.php
Merge branch 'master' into develop