test

testing
Merge branch 'master' of https://github.com/livst89/jumpjump

Conflicts:
	jumping/Library/CurrentLayout.dwlt
	jumping/Library/assetDatabase3