trying to fix asset pipeline issue
Merge branch 'master' into map_display
Merge pull request #34 from arieldiamond/map_display

Map display