Merge pull request #4 from jjgerber/master

Added command line placement and movement phases.
Merge pull request #5 from jjgerber/master

Version 1.0.001 Command Line style of the game
Version 1.2.000
This version contains a fully functional version of
the game using a GUI interface

New to this version:
	Updated GUI screens for each part of program
	Functionality for gamePanel to print out current state of board
	Conversion of matrix value to loaction label from gamePanel
	How to menu item showing a temporary screen for instructions
	About menu item showing authors of project
	Movement phase, remove phase, placement phase, and gameOver phase
	with added functionality to interact with gui
	Command line interface removed from this version
	Basic game mechanics added:
		Check for mills
		Check phase and update correctly
		Determine score
		Determine winner/loser

Needs to be done:
	AI version of game
		AI player should also choose random color each time
		Version 2.0 should include AI play
	Undo button for game
		Menu Item is included
		Button added to GameBoard class
			Simple enough, just need to figure out below
		Find way to load previous state of game
	Way to save previous states of game
		A stack would work, but how?

	Leaderboard added functionality
	Possibly drag and drop GUI
		Would require building of Animation engine?
		Might require complete overhaul of GUI system
	Load/Save Games
		This is an extra feature
		Wouldn't seem to difficult
		Just need to determine the best way to save it
Version 1.0.0001
Removed the oldNMM folder as it is no longer needed
Merge branch 'mine' of https://github.com/xsimzay/nineMensMorris
Version 1.2.01001
Removed not needed files and resources
Version 1.2.01002
Removed 1 more not needed file
Version 1.0.100
Remove not needed files from folder
Moved board.txt to resources folder
Updated Board.java to load from resources folder
Version 1.2.1000
Updated the GUI
	Now has a help menu item to show colors
Updated all files
	All Files now have comments explaining what each function does
Merge branch 'mine' of https://github.com/xsimzay/nineMensMorris into mine
Merge pull request #6 from jjgerber/master

Version 1.3
Version 1.4.01.12
Phase 1 incorporated with the GUI
	Board is complete to requirements doc
	GameModel work to phase 1

   Need completed
	Undo button
		Add a gameState class
		Create stack object in Model
		Push gamestate onto stack before updating
		update gamestate
		Load the previous state if undo
	AI
Merge branch 'mine'
Merge branch 'master' of https://github.com/xsimzay/nineMensMorris

Conflicts:
	NMM/bin/nmm/controller/NMMGameModel.class
	NMM/bin/nmm/main/NineMensMorris.class
	NMM/bin/nmm/model/Board.class
	NMM/bin/nmm/model/GamePiece.class
	NMM/bin/nmm/model/user/Player.class
	NMM/bin/nmm/view/MainWindow$1.class
	NMM/bin/nmm/view/MainWindow$2.class
	NMM/bin/nmm/view/MainWindow$3.class
	NMM/bin/nmm/view/MainWindow$4.class
	NMM/bin/nmm/view/MainWindow$5.class
	NMM/bin/nmm/view/MainWindow$6.class
	NMM/bin/nmm/view/MainWindow.class
	NMM/bin/nmm/view/VictoryScreen$1.class
	NMM/bin/nmm/view/VictoryScreen$2.class
	NMM/bin/nmm/view/VictoryScreen.class
	NMM/bin/nmm/view/WelcomeScreen$1.class
	NMM/bin/nmm/view/WelcomeScreen$2.class
	NMM/bin/nmm/view/WelcomeScreen.class
	NMM/bin/nmm/view/gameBoard/GameBoard.class
	NMM/bin/nmm/view/gameBoard/GamePanel.class
	NMM/bin/nmm/view/gameBoard/PlayerPanel.class
	NMM/bin/nmm/view/newGame/NewGameScreen.class
	NMM/bin/nmm/view/newGame/NewPVE$1.class
	NMM/bin/nmm/view/newGame/NewPVE.class
	NMM/bin/nmm/view/newGame/NewPVP$1.class
	NMM/bin/nmm/view/newGame/NewPVP.class
	NMM/src/nmm/controller/NMMGameModel.java
	NMM/src/nmm/main/NineMensMorris.java
	NMM/src/nmm/model/Board.java
	NMM/src/nmm/model/GamePiece.java
	NMM/src/nmm/model/user/Player.java
	NMM/src/nmm/view/MainWindow.java
	NMM/src/nmm/view/VictoryScreen.java
	NMM/src/nmm/view/WelcomeScreen.java
	NMM/src/nmm/view/gameBoard/GameBoard.java
	NMM/src/nmm/view/gameBoard/GamePanel.java
	NMM/src/nmm/view/gameBoard/PlayerPanel.java
	NMM/src/nmm/view/newGame/NewGameScreen.java
	NMM/src/nmm/view/newGame/NewPVE.java
	NMM/src/nmm/view/newGame/NewPVP.java
Version 1.4.11
Finished phase
Version 1.5
Glow added to selected pieces after movement phase
	Possible additions
		Movement animation
		Remove animation
	Needed additions
		Game state class
		undo button
		nicer looking color tab
Version 1.5.10
Modified the gbClass a little bit
Version 1.6
Further Modifications
	Movement animation of pieces has been added
	Undo still needs completed
	AI still needs implemented
Version 1.6.2
Further modifications
	Movement animation added
	AI needs implemented
	Undo needs added
Version 2.0
PVE added
	AI has been added
	Movement has been updated to be smoother
	and quicker

	UNDO still needs implemented