Removed file that shouldn't be tracked
Merge remote-tracking branch 'max_temp/master'
2 from Xcode
Merge remote-tracking branch 'max_temp/master'
3 from Xcode
Merge remote-tracking branch 'max_temp/master'