Added jsoup and encoder test
Merge branch 'master' of github-vastsuperking:spfrommer/platformer

Conflicts:
	src/platformer/Platformer.java