Merge pull request #1 from Group15-OS/master

I want them to be same... actually the changes should be on default branch
Merge pull request #2 from Group15-OS/newAttempt

Merge pull request #1 from Group15-OS/newAttempt