Update
Merge branch 'master' of https://github.com/alexlwilson/G3

Conflicts:
	CNAME