Linkando as paginas e padronizando o idioma portugues
linkdano paginas
Merge branch 'master' of https://github.com/istim/layout into istim-layout-master

Conflicts:
	friends.html
	item_transactions.html
	my_items_for_trade.html
linkando paginas
linkdano mais paginas
terminando de linkar as paginas
terminando de linkar as paginas2
arrumando os conflitos
teste final dos links
Merge pull request #65 from silastiago/master

Linkando as paginas