Second commit: merging all files in project