changed file name to relect ubc
Removed old file name
merge commits