introduced difficulty
merged player funds

Conflicts:
	scripts/main.js
merge difficulty and water bombs

Conflicts:
	scripts/main.js