caravan map changes
Merge branch 'frontend_byran'

Adding frontend works