Redesign of layout

Completely redesigned the layout
Resolving some conflicts...

Conflicts:
	css/style.css
	footer.php
	header.php
	upload.php