added 'ignored' alias for git
Merge remote-tracking branch 'origin/master'