Vidas, vidas, VIDAS
Merge branch 'master' of https://github.com/Turtledorm/river-raid

Conflicts:
	bin/River
	include/Base.h
	include/Cenario.h
	include/Nave.h
	include/Tiro.h
	obj/Cenario.o
	obj/Main.o
	obj/Nave.o
	obj/Tiro.o
	src/Cenario.c
	src/Defesa.c
	src/Main.c
	src/Nave.c
	src/Tiro.c