previous stuff before pull
Merge branch 'master' of https://github.com/dtracers/PumpAndJump
Merge branch 'master' of https://github.com/dtracers/PumpAndJump
update desktop resolution