Conflicted files - still working on css
Merge branch 'maxl' of https://github.com/mporam/TaskManagr into maxl
Adding of variables and the sorting out of the grid
Merge branch 'maxl' of https://github.com/mporam/TaskManagr into maxl

Conflicts:
	demo/css/stylesheet.less
	demo/index.php
not much to tell to be honest.
Merge branch 'develop' into maxl

Conflicts:
	demo/includes/template/header.php
	demo/includes/template/nav.php
create search feature
Merge pull request #14 from mporam/mporam

Create search feature
Merge pull request #10 from mporam/maxl

Maxl