test
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-wee
Merge pull request #1 from mehere/dev

weechong-ong wants to merge 58 commits into dev-wee  from dev
teacher add/delete/edit
teacher add/delete/edit
teacher add/delete/edit
teacher add/delete/edit
teacher add/delete/edit
teacher add/delete/edit
teacher add/delete/edit
Merge pull request #2 from mehere/dev-wee

Merge pull request #1 from mehere/dev
Merge pull request #3 from mehere/dev

Pull Request from dev -> dev-wee on 25/1
Merge branch 'dev-wee' of https://github.com/mehere/RTSS.git into dev-wee
Modified upload.php for enctype="multipart/form-data". Added action to relay to controller _upload.php
Created a namematch.php which will be a placeholder for new codes.
Merge pull request #4 from mehere/dev-wee

Merge changes from dev-wee to dev. Created namematch.php which is empty now.
to be reverted
to be reverted
to be reverted