Final commit for group A project