Movimientos del personaje principal
Merge origin/master

Conflicts:
	src/main/Trigger.java
Merge origin/master

Conflicts:
	src/main/Base.java
	src/main/Character.java
	src/main/Terrain.java
	src/main/Trigger.java