fixes
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
  grid
  first slide

Conflicts:
	src/scripts/main.coffee
	src/stylesheets/main.scss