Removed the stupid strange file that shouldn't be traked
Merge remote-tracking branch 'github/master'
1014 5pm