Removed file that shouldn't be tracked
Merge remote-tracking branch 'github/newMaster' into newMaster