Merge pull request #12 from SCS-hackers-group/anas_branch

Just messing around with Windows Github - Test
Trying to create a merge conflict
Merge remote-tracking branch 'origin/master' into anas_branch