edit gitignore
Merge remote-tracking branch 'origin/GPU-way'