add bguy
Merge branch 'master' of https://github.com/boo1ean/molyjamdn
add some scene
Merge branch 'master' of https://github.com/boo1ean/molyjamdn

Conflicts:
	src/js/data/level1Data.js
Merge branch 'master' of https://github.com/boo1ean/molyjamdn
add some scene
Merge branch 'master' of https://github.com/boo1ean/molyjamdn

Conflicts:
	src/coffee/enemy.coffee
fix