init
Merge branch 'master' of https://github.com/jouhri/my_web_site

Conflicts:
	.gitignore