beta bar – inset shadow
fixing conflict

Conflicts:
	client/beta-bar/style.css
Add button to style guide
beta bar – inset shadow
Merge branch 'design' of github.com:conveyal/modeify into design