init
Merge branch 'master' of https://github.com/xMandrake/Blog.git

Conflicts:
	.gitignore