commit for merging
fix for merging
icon font
maps for sidebar
starting with header
app.js!
merging