New project files merged with old ones for use in homework 4