Ignored OSX specific files
Removed conflicted file
Ignored OSX specific files