NingG
Merge branch 'master' of github.com:ningg/ningg.github.com

Conflicts:
	CNAME