added melonjs boilerplate
fixed conflict
derp fix conflict