slopeshoto files
Merge branch 'master' of github.com:pony5580/slopeshoto

Conflicts:
	.gitignore