edit gitignore
Merge remote-tracking branch 'ring/master'
Makefile を微修正