Initial Commit
Fixed merge problems via random deletion tactics. Seemed to work