Create gh-pages branch via GitHub
Merge branch 'master' of https://github.com/randombrad/websites into gh-pages

Conflicts:
	index.html
update
Update
update json
Merge branch 'gh-pages'

Conflicts:
	js/sponsors.json
	villagevine.org/index.html
	villagevine.org/js/sponsors.json