Manually programming site
Merge branch 'master' of https://github.com/remony/remony.github.io

Conflicts:
	CNAME