Added change in resolution.
Merge branch 'master' of https://github.com/thejosh223/pudgewars.git

Conflicts:
	src/pudgewars/entities/PudgeEntity.java