Finished mapping functionality
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014