Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Turned off fill for beat boundaries so the stacking order is not an issue
Merge branch 'fix_layer_order' into gh-pages
Changed the outline color
Merge branch 'fix_layer_order'

Conflicts:
	js/map.js
Merge branch 'fix_layer_order'
Super basic remember search function working. Need to clean up duplicate event handlers