Switching branches
Merge branch 'ui_functionality' of https://github.com/cs27x/team5 into ui_functionality
Added map functionality