merge gh-pages into master for beginning template purposes