JUST GET THESE FUCKING FILES OUT OF MY FUCKING GIT!
Merge branch 'maxl' of https://github.com/mporam/TaskManagr into maxl

Conflicts:
	demo/includes/template/nav.php
Merge branch 'maxl' of https://github.com/mporam/TaskManagr into maxl