Doc Website updated
Working Combat

Still need to add weapons and strength
Conflicts with Game.java

Conflicts:
	Java Version/Game.java