alt
Merge branch 'master' of https://github.com/Mexijewmaican/Flappy-Mexican

Conflicts:
	Main.java