Merge pull request #71 from mehere/dev-wee

Modified ScheduleState to returned condensed skippedLesson
resolve conflict
resolve conflict
Merge pull request #72 from mehere/dev

Pull Request from dev -> dev-wee on 2/3