basic skeleton
merge gh-pages into master