Did Some stuff

LOL YOUR A RANDOM
Merge branch 'master' of https://github.com/maxthelinkfan/bMinigame

Conflicts:
	src/me/brawl/Main/Main.java