.gitignore is now working
Create README.md
Create CNAME
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md