Removed file that shouldn't be tracked
Merge remote-tracking branch 'github/master'
1014 10pm