basket page
removing ds store files
Merge branch 'master' of https://github.com/sammarcuson/BoxRogerUI

Conflicts:
	.gitignore
	config.codekit
	css/screen.css
	sass/components/_buttons.scss
	sass/helpers/_variables.scss
	sass/layout/_header.scss
	sass/layout/_main.scss
sm update