Merge branch 'master' of github.com:ThibaultLaurens/thibaultlaurens.github.com

Conflicts:
	.gitignore
	README.md
plugins
plugins
plugins