updated push pull
poornima's sync stuff for local
Merge branch 'master' of https://github.com/CG3002-Design-Project/CG3002