first
Update CNAME
first
Merge branch 'master' of github.com:regisfoucault/personalfiles

Conflicts:
	index.html
	posts/2013-04-04-clever-cloud-heroku-pg-config.html
	posts/2013-04-12-nextcheckinreminder.html
	posts/2013-10-18-hosting-can-improve-ecommerce-turnover.html
fix merge
fix merge