I got forced by jamie
Added
Merge branch 'master' of https://github.com/ExotickBoy/PaintBall.git

Conflicts:
	PaintBall/src/ga/zotick/main/Main.java