Initial 2D mapping.
Merge branch 'master' of https://github.com/mjavaid/fyp-uottawa