Adding activity_main file so that it does not crash
Merge conflict
FullSchedule activity, merged changes from other branches
Merge pull request #7 from SCS-hackers-group/am_branches

Merging amanda's updated splash screen
Merging conflicts from master
Merging conflicts
Merge pull request #9 from SCS-hackers-group/john_branch

Merging john's branch into master, Manifest does not declare ScheduleView activity
Fixing up the imports of the ViewPagerIndicator library, adding implicit menu to allow switching between activities
Merge pull request #11 from SCS-hackers-group/anas_branch

Fixing up the imports of the ViewPagerIndicator library, adding implicit...
Just messing around with Windows Github

Since when we care about optional stuff?
Merge pull request #12 from SCS-hackers-group/anas_branch

Just messing around with Windows Github - Test
fixed errors in R file

banana
Merge pull request #13 from SCS-hackers-group/bav

fixed errors in R file