merge eece513 project code