Adding activity_main file so that it does not crash
Updating minSDKversion, removing unnecessary folders
Added file that contains schedules in xml format
utl-->utf (commit test)
Creating the activity main file for everyone
Adding menu file so that people spend the rest of the day merging conflicts
We are noobs D;

Splash_screen.png added
splash.xml
Splash.java
c:
:D The Splash Screen~

-AndroidManifest.xml
splash.xml
Splash.java
Splash Screen + comments
.\AndroidManifest.xml
Merge pull request #5 from SCS-hackers-group/nico_branch

Nico branch
Added user preference activity
Merge pull request #6 from SCS-hackers-group/nico_branch

Removed unusued imports
merging changes from master
Changed Splash picture
Merge branch 'master' of https://github.com/SCS-hackers-group/Concordia-Shuttle-Bus-App into annie
Merge pull request #8 from SCS-hackers-group/annie

Annie
Merge conflict
FullSchedule activity, merged changes from other branches