Started Merging Controller and Model
Merge branch 'master' of https://github.com/meylingtaing/COE1186