.info
Merge branch 'master' of https://github.com/allanwhite/allanwhite.github.io

Conflicts:
	cname