ooooo
Merge branch 'master' of git@github.com:dziubi/projekt.git

Conflicts:
	application/controllers/IndexController.php

Signed-off-by: dziubi <dziubi@wp.pl>