locations
Merge branch 'master' of https://github.com/smonette/ambivalent-narwhal

Conflicts:
	ixd2-proto/sass/screen.scss
	ixd2-proto/stylesheets/screen.css
Ignore sass-cache files.