Merge branch 'project2_startup'