Implementação dos gráficos
Merge branch 'master' of https://github.com/adalbertocmelo/projeto1

Conflicts:
	workspace/QoEAT/WebContent/WEB-INF/classes/com/acesso/html/intranet.htm
	workspace/QoEAT/WebContent/WEB-INF/classes/com/qoeat/html/GraPsnrCongest.html
	workspace/QoEAT/WebContent/acesso/tIntranet.js
	workspace/QoEAT/WebContent/qoeat/tGraMQoECongest.js
resolução de conflito