mapping updates
Merge branch 'master' of https://github.com/coffee-n-code/hackathon-team2
Merge branch 'master' of https://github.com/coffee-n-code/hackathon-team2
Merge branch 'master' of https://github.com/coffee-n-code/hackathon-team2
mapping updates