update .gitignore
Merge remote-tracking branch 'nikoli/build_system'

Conflicts:
	.gitignore