removido arquivo teste diogo.txt
removido arquivo do cscope
Merge branch 'master' of https://github.com/crbonilha/olsrd

Conflicts:
	src/cscope.out
novos comentarios