animations done
Merge branch 'master' of https://github.com/pika7/Group1_FYP