gitall
Merge branch 'master' of github.com:jamesbeedy/jamesbeedy.github.io
gh-pages
Merge branch 'master' of github.com:jamesbeedy/jamesbeedy.github.io

Conflicts:
	_build/html/_sources/index.txt
	_build/html/_static/ajax-loader.gif
	_build/html/_static/basic.css
	_build/html/_static/comment-bright.png
	_build/html/_static/comment-close.png
	_build/html/_static/comment.png
	_build/html/_static/default.css
	_build/html/_static/doctools.js
	_build/html/_static/down-pressed.png
	_build/html/_static/down.png
	_build/html/_static/file.png
	_build/html/_static/jquery.js
	_build/html/_static/minus.png
	_build/html/_static/plus.png
	_build/html/_static/pygments.css
	_build/html/_static/searchtools.js
	_build/html/_static/sidebar.js
	_build/html/_static/underscore.js
	_build/html/_static/up-pressed.png
	_build/html/_static/up.png
	_build/html/_static/websupport.js
	_build/html/sources/index.txt
	_build/html/static/ajax-loader.gif
	_build/html/static/basic.css
	_build/html/static/comment-bright.png
	_build/html/static/comment-close.png
	_build/html/static/comment.png
	_build/html/static/default.css
	_build/html/static/doctools.js
	_build/html/static/down-pressed.png
	_build/html/static/down.png
	_build/html/static/file.png
	_build/html/static/jquery.js
	_build/html/static/minus.png
	_build/html/static/plus.png
	_build/html/static/pygments.css
	_build/html/static/searchtools.js
	_build/html/static/sidebar.js
	_build/html/static/underscore.js
	_build/html/static/up-pressed.png
	_build/html/static/up.png
	_build/html/static/websupport.js
	sources/index.txt
	static/ajax-loader.gif
	static/basic.css
	static/comment-bright.png
	static/comment-close.png
	static/comment.png
	static/default.css
	static/doctools.js
	static/down-pressed.png
	static/down.png
	static/file.png
	static/jquery.js
	static/minus.png
	static/plus.png
	static/pygments.css
	static/searchtools.js
	static/sidebar.js
	static/underscore.js
	static/up-pressed.png
	static/up.png
	static/websupport.js