Merge origin/master

Conflicts:
	buscarArtigo.php
	css/style.css
	includes/menuPS.php
	nintendo.php
	nostalgia.php
	pc.php
	playstation.php
	xbox.php
Merge origin/master

Conflicts:
	buscarArtigo.php
	css/style.css
	includes/menuPS.php
	nintendo.php
	nostalgia.php
	pc.php
	playstation.php
	xbox.php
Merge origin/master

Conflicts:
	admin/css/style.css
	admin/novoUsuario.php
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	includes/funcoesUteis.inc
Merge origin/master

Conflicts:
	admin/css/style.css
	admin/novoUsuario.php
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	includes/funcoesUteis.inc