Missing comma
Merge branch 'master' of github.com:bellycard/rolodex into buttons

Conflicts:
	vendor/assets/stylesheets/components/_buttons.sass
Merge pull request #6 from shayhowe/buttons

Missing comma