adds git alias 'ap' and 'ng'
Merge remote-tracking branch 'origin/master' into cana