No longer generating 1296 items
COME ON JUST COMMITTTTT
Merge branch 'dev' of https://github.com/sothie1/471_PROJECT into dev

Conflicts:
	Mastermind/nbproject/private/private.properties
	Mastermind/nbproject/project.properties
	Mastermind/src/mastermind_strategies/FiveGuess.java
local committttt
Error in Pattern.  Out of bounds Exception.  NumPegs is correct, error is in Pattern.java.