Initial commit
hello world
Hello world 111.
hello world
some text.
Merge remote-tracking branch 'self/master'

Conflicts:
	LICENSE.txt
	README.md
	composer.json
	composer.phar
	config/application.config.php
	config/autoload/README.md
	config/autoload/global.php
	config/autoload/local.php.dist
	init_autoloader.php
	module/Application/config/module.config.php
	module/Application/language/ar_SY.po
	module/Application/language/cs_CZ.po
	module/Application/language/de_DE.po
	module/Application/language/en_US.po
	module/Application/language/es_ES.po
	module/Application/language/fr_CA.po
	module/Application/language/fr_FR.po
	module/Application/language/it_IT.po
	module/Application/language/ja_JP.po
	module/Application/language/nb_NO.po
	module/Application/language/nl_NL.po
	module/Application/language/pl_PL.po
	module/Application/language/pt_BR.po
	module/Application/language/tr_TR.po
	module/Application/language/zh_CN.po
	module/Application/language/zh_TW.po
	module/Application/src/Application/Controller/IndexController.php
	module/Application/view/application/index/index.phtml
	module/Application/view/error/404.phtml
	module/Application/view/error/index.phtml
	module/Application/view/layout/layout.phtml
	public/.htaccess
	public/css/bootstrap.min.css
	public/css/style.css
	public/js/bootstrap.min.js
	public/js/jquery.min.js
	vendor/README.md