work changes + adding meet

stuff
Merge branch 'master' of https://github.com/alw231/BuildingBlocks

Conflicts:
	css/main.css
Merge branch 'master' of https://github.com/alw231/BuildingBlocks

Conflicts:
	css/main.css