kevin's branch
commit
Merge remote-tracking branch 'origin/master' into kevinbranch

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of github.com:french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
Merge https://github.com/french-toast-mafia/ChessGame into kevinbranch
wrote bishop class
Fixed the bishop class
Fixed the bishop class
added scrolling text field that displays recent moves and which player turn it is
added text field to display moves
fixed code
Merge pull request #12 from french-toast-mafia/kevinbranch

merging kevin's extended GUI with text box