Our completed project, since we literally merged everything on my pc