algo input update; upload AED timetable
Merge pull request #23 from mehere/dev

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