changes
Merged

Merge branch 'master' of https://github.com/cts/mockups
shafi
foo
moving jekyll stuff to its own folder