Accidentally messed up version controlling. Manually fixed files by hand
fixing project...