Merge fuckups
Ignore object files & precompiled headers