Merge pull request #2 from SEGroup10/test

Merg test with master
Merge remote-tracking branch 'origin/test'
Merge pull request #4 from SEGroup10/master

Merge after sprint