creating a new jekyll version
updating to twitter bootstrap 3.0.0
ignoring _site
updating the base of it
updating the base of it
fixing merge and making jekyll the main branch