temp teacher edit
Merge pull request #12 from mehere/dev-wee

Merge pull request from dev-wee to dev on 31Jan
date format updated
Merge pull request #14 from mehere/dev

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