Trying to create a merge conflict
Merge remote-tracking branch 'origin/master' into anas_branch
Fixing up the imports of the ViewPagerIndicator library, adding implicit menu to allow switching between activities
Just messing around with Windows Github

Since when we care about optional stuff?
fixed loy schedule link
create Utils.java

Created method to get next bus to loyola and to sgw inside Utils.java
made improvements to Utils.java for put #14
Merge pull request #14 from SCS-hackers-group/john_branch

John branch: adding Utils.java which contains the methods to get the time for the next bus leaving. TODO: create unit tests, create a convenience function that takes current time and returns three dates for last bus leaving, next bus and one after it.
Update the readme with name of contributors
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
Splash Screen Updates

-Made a .png file for every dpi file
-Removed uncessary and unused splash screen .png files
Merge remote-tracking branch 'origin/master' into am_branches