little changes

Signed-off-by: Otakode <marchal.cl@gmail.com>
Merge branch 'master' of https://github.com/otakode/Boxe

Conflicts:
	Assets/test.unity
pouet

Signed-off-by: Otakode <marchal.cl@gmail.com>