Merge pull request #61 from cca-team3-webproject/master

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

Merge pull request #61 from cca-team3-webproject/master