change index content
added another file
more text
added config file
Merge branch 'testing' of github.com:Cidro/test-app into testing
config submodule added
fixed config submodule url
Text for demo
Merge branch 'testing'

Conflicts:
	index.php