qazwsxedc
Merge branch 'master' of https://github.com/JPavez/humano

Conflicts:
	Humano/src/Humano/Main.java