init
Merge branch 'master' of https://github.com/Fabszn/parisjug2015

Conflicts:
	README.md