First real commit

First real commit
Merge branch 'master' of https://github.com/ColasV/blog_main