circle
Merge branch 'master' of https://github.com/masahirompp/3dmind

Conflicts:
	app/ts/main.ts