first commit
bug 1
bug 2
Merge branch 'master' of github.com:sylvain-cl/demo

Conflicts:
	.gitignore