k
Merge branch 'AlanJackMVP' of https://github.com/logantspeedy/Capstone into AlanJackMVP

Conflicts:
	Capstone/nbproject/genfiles.properties
	Capstone/nbproject/project.properties
	Capstone/nbproject/project.xml
added game history and fortify slider
Merge branch 'AlanJackMVP' of https://github.com/logantspeedy/Capstone into AlanJackMVP
added missing JS