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

Conflicts:
	.gitignore
	README.md
Merge branch 'source' of github.com:ThibaultLaurens/thibaultlaurens.github.com into source