Fist obstacle
merge?
try merge gain
merge
merge
Merge branch 'master' of https://github.com/Winkies/Type-R
add ship movement
Merge branch 'master' of https://github.com/Winkies/Type-R

Conflicts:
	Makefile
	main.cpp
merge tchaokko
merge tchaokko
it's the final merge my friend