Fake 2 commit
Merge branch 'master' of https://github.com/MaximeHelen/WallTube

Conflicts:
	Client/Samples/sample.html