Fixed error related with TodosController
Merge branch 'master' of github.com:olgundutkan/todos

Conflicts:
	app/controllers/TodosController.php