cool
added styles, modified gulpfile
cool story
fixed merge conflict