finished backtotop
added favicon
set to local
formatted main_container
fixing merging conflicts
Merge remote-tracking branch 'remotes/origin/formatMainContainer'

Conflicts:
	conDB.php