config.ru
Merge branch 'master' of https://github.com/audriusl/Eserti

Conflicts:
	config.ru