popup
Merge branch 'master' of github.com:UrbanIF/urban_space_100

# By Victor Rubych
# Via Victor Rubych
* 'master' of github.com:UrbanIF/urban_space_100:
  grid fixes

Conflicts:
	src/stylesheets/main.scss