Merge branch 'gh-pages' of https://github.com/daishihmr/glshooter2 into gh-pages

Conflicts:
	assets/raw/dummy.png
	assets/raw/image/fighter1.png
	assets/raw/image/fighter2.png
	assets/raw/image/fighter3.png
	assets/raw/image/fighter4.png
	assets/raw/image/fighter5.png
	assets/raw/image/fighter6.png
	assets/raw/image/fighter7.png
	assets/raw/image/tex1.html
	assets/raw/l3p/s-head.$3p
	assets/raw/l3p/s-head.L3P.BMP
	assets/raw/l3p/s-head.l3p
	assets/raw/laser.png
	assets/raw/r.html
	assets/raw/r0.png
	assets/raw/r1.png
	assets/raw/r2.png
	assets/raw/shot.png
	assets/tex1.png
	index.html
	src/GameScene.js
	src/Player.js
	src/enemy/Enemy.js
	src/enemy/EnemyHard.js
	src/main.js
Merge branch 'develop' into gh-pages

Conflicts:
	index.html
	src/GameScene.js
	src/Player.js
	src/enemy/Enemy.js
	src/main.js
Merge branch 'develop' into gh-pages

Conflicts:
	index.html
	src/GameScene.js
	src/Player.js
	src/enemy/Enemy.js
	src/main.js
Merge branch 'develop' into gh-pages
demo page
Merge branch 'develop' into gh-pages

Conflicts:
	index.html
for demo
Merge branch 'develop' into gh-pages
Merge branch 'gh-pages' of https://github.com/daishihmr/glshooter2 into gh-pages

Conflicts:
	index.html
	src/enemy/Enemy.js
	src/enemy/EnemyHard.js
	src/main.js
Merge branch 'develop' into gh-pages

Conflicts:
	src/GlShooter2.js
ignore
Merge branch 'develop' into gh-pages

Conflicts:
	.gitignore
	src/GlShooter2.js
update dependencies
Merge commit '9a7fa750934eabbbd87ba6843185b54604bbac14' into gh-pages

Conflicts:
	src/GlShooter2.js
Merge branch 'develop' into gh-pages

Conflicts:
	libs/tmlib.js
	libs/tmlib.min.js
	src/GlShooter2.js
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge commit '8445703c51ececc5d2f5492545deba2ce7b34891' into gh-pages