Adding activity_main file so that it does not crash
Merge conflict
FullSchedule activity, merged changes from other branches
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