.
Merge branch 'master' of github.com:Entrances/entrances.github.com

Conflicts:
	CNAME
Merge branch 'master' of github.com:Entrances/entrances.github.com
.