Fase de testes teste2.xml adicionada
teste2.xml adicionado
Merge branch 'master' of https://github.com/fabiopicchi/GGJ2013

Conflicts:
	resources/fase1.xml
	resources/fase1a.xml