Save task for project/index
Merge branch 'master' of https://github.com/ilyaulyanov/projek

Conflicts:
	application/views/project/index.php
	public/css/app.css