photosphere first try
add box to move forward and backward
Merge branch 'master' into deploy

Conflicts:
	.gitignore