Style Switch
Merge branch 'dev' of github.com:CruWeb/patterns into gh-pages
Merge branch 'gh-pages' of github.com:CruWeb/patterns into gh-pages
Adding header and footer to articles
nav to all pages
Merge branch 'gh-pages' of github.com:CruWeb/patterns into gh-pages
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages
Changing path
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages

Conflicts:
	_config.yml
styles
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages
urls
placeholder pages
Paths
home
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages

Conflicts:
	static/templates/home.html
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages
Merge branch 'master' of github.com:CruWeb/patterns into gh-pages