t
Merge branch 'master' of https://github.com/GoesOnGhost/DataStructAlgorithmsConfProject2014

Conflicts:
	Player.java
Brainstorming

Initial work to create Pack class and link it to the player class; a
few other miscellaneous thoughts