Added CSS on server
Merge branch 'master' of github.com:rtdean93/canvas

Conflicts:
	profiles/commerce_kickstart/themes/commerce_kickstart_theme/css/commerce_kickstart_style.css
Merge branch 'master' of github.com:rtdean93/canvas
Added files