Removed inapropriate stuff
fixing conflict
Merge branch 'master' of github.com:stoutouloutou/stoutette

Conflicts:
	Doc/config pi