Trying to create a merge conflict
Merge remote-tracking branch 'origin/master' into anas_branch
Merge branch 'master' into anas_branch
Merge branch 'master' of https://github.com/SCS-hackers-group/Concordia-Shuttle-Bus-App into anas_branch
Adding project.properties to version control
Adding the test project
Adding an example unit test for the getNextBusLoy
Merge pull request #15 from SCS-hackers-group/anas_branch

Anas branch