changed from liquid to jekyll, set up gulp
made jekyll compile to the right places
moved sass to within jekyll files and renamed folders
merged master