keloke

Signed-off-by: Fernando V <fvalarinon@gmail.com>
Merge branch 'master' of github.com:obandox/silencio_capitolio

Conflicts:
	Assets/App/Textures/sonic_hd_sprite_by_moongrape-d54boq6.png.meta