tweaked and cleaned landing page navbar styling on hover and focus
added fontawesome package to meteor, changed tour.html setting to cogs icon
added ionicons package
handled display of contextual information for smaller screens (see what happens to the left panel when you squeeze the width of your browser window)
fixed conflict on styles.less
conclude merge after dealing with .DS_Store conflicts