modified:   .gitignore
	new file:   app/config/config.ini
	deleted:    app/config/config.php-EXAMPLE
	modified:   public/index.php
Merge branch 'master' of https://github.com/mixuuu/lauta

Conflicts:
	public/index.php