dev-branch init
fixed w/scss
merged dev-branch w/ master