飽きた。Photonは抜いてる
Merge branch 'master' into remote_master

Conflicts:
	.gitignore