oops, Projekte und Team kaputtvergessen
ignore build/
Merge branch 'refs/heads/master' into migrate2middleman

Conflicts:
	.gitignore
	src/stylesheets/application.sass