Add .gitignore
Merge remote-tracking branch 'origin/sato'

Conflicts:
	.gitignore