Updated Files

New Framework and updated files
Merge branch 'master' of https://github.com/CCW14Web/Assignment03