Fixing ignore
Merge remote-tracking branch 'origin' into beta