тестовый проект
Merge branch 'master' of https://github.com/Lara-gru/fuelphp-test

Conflicts:
	README.md

modified:   README.md