Merge pull request #33 from arieldiamond/map_display

Map display
trying to fix asset pipeline issue
Merge branch 'master' into map_display