Merge branch 'master' of C:\xampp\htdocs\Team-Solidaster with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/elements/header.php
Merge remote-tracking branch 'origin/master'
sidebar li removed, a added