new developer added for renessainse
removed from source control
Added:
-- Sort columns;
-- Totals;
Stop tracking:
-- .idea\workspace.xml
Merge branch 'mikitas_branch' of https://github.com/ZloiBubr/ReportTool into Edgar_Branch

Conflicts:
	.idea/workspace.xml
	middleware/personalprogress.js
	public/pages/timeSheet2week.html
Merge remote-tracking branch 'origin/master' into Edgar_Branch
Add:
-- Total for new column;
fix to ignore Out of Scope pages
Merge branch 'master' of https://github.com/ZloiBubr/ReportTool
Merge branch 'master' into Edgar_Branch