Adicionando .idea ao gitignore
Conflits
Merge branch 'develop' of github.com:cloudfishin/nhandereko into develop

Conflicts:
	views/webapp/prova/terra.html
Add imagens to missions fire, water, wind and earth