Make sure to fix gitignore
include all files
Merge remote-tracking branch 'origin/current'