design file
Merge remote-tracking branch 'origin/styling' into styling

Conflicts:
	design.psd
Updates to styles