updating stuff
Merge branch 'master' of http://github.com/mattijle/exiles

Conflicts:
	ladder.js