stuff
Merge branch 'master' into random

Conflicts:
	Gittitesti/Gittitesti/main.cpp
Merge branch 'random'