Merge pull request #1 from Kotzi/master

Mi primer commit (?) ya estan los tiles funcionando
Melon.js test: Tilemap load
Melon.js test: Character
Melon.js test: [WIP] Water
Resizable water
Removed annoying body margin
Water raise
Water refactor
Added death by water check
Reset on death
Fix paths (again)
Merge remote-tracking branch 'kotzi/master'

Conflicts:
	assets/metatiles.png
	assets/water.png
	data/testlevel.tmx
	js/character.js
	js/resources.js
Added simple buoyant object
Merge remote-tracking branch 'kotzi/master'

Conflicts:
	js/character.js
Merge remote-tracking branch 'kotzi/master'

Conflicts:
	js/character.js
Basic .editorconfig file
New level
Merge pull request #5 from julioolvr/new-level

New level
Removed game scaling
WIP log