moved to jekyll and single page app
fix conflicts