rajout html
ignore vim *.swp files
Merge branch 'master' into dev