Ignore all sass cache files
Merge branch 'gh-pages'

Conflicts:
	.gitignore
Added a new Participating Companies subsection to the agenda section
Merge branch 'master' into gh-pages
set the baseurl correctly for github pages