Revert "Merge branch 'master' of https://github.com/14B2-webweb/Dykon-Redesign"

Conflicts:
	css/style.css
	includes/header_inc.php