Added project file, some changes made by Justin and Kevin