ads
Merge branch 'master' of https://github.com/meitcher/sphincter-war

Conflicts:
	src/new/Janela.class
Merge branch 'master' of https://github.com/meitcher/sphincter-war

Conflicts:
	src/new/Janela.class