added tabs
Merge branch 'merging' into tabs

Conflicts:
	client/Templates/layout.js

merging branches
t push origin mergingMerge branch 'tabs' into merging

merging friday demo commits and css