fixed Disc

derp... convention gone now
Merge branch 'master' of https://github.com/iamsand/Othello

Conflicts:
	bin/othello/Disc.class
	src/othello/Disc.java