'updating files'
Merge branch 'master' of github.com:jimmy1248/GameModeZero

Conflicts:
	.classpath
	src/net/jimmy1248/gamemodezero/GameModeZero.java

'fixing conflicts'