changed config
comments
Merge branch 'cleanpoemsondb'

Conflicts:
	controllers/Controller.php
	controllers/FormController.php
	models/Model.php
	views/FormView.php
	views/MainView.php