Translation
Merge branch 'master' of github.com:soundarapandian/faunalia

Conflicts:
	translated/es/training.po