Documentacion
Merge branch 'master' of https://github.com/MarcoRmz/flappyGame

Conflicts:
	src/flappy/Base.java