Add spears texture, fix animation duration
Merge branch 'master' of https://github.com/wanze/GameDevProject

Conflicts:
	src/gamedev/objects/Player.java