first commit
Merge branch 'master' of https://github.com/fukuda125/sapd

Conflicts:
	.gitignore