Merge pull request #58 from cca-team3-webproject/goodbye

Goodbye