change user name test#29
29
Merge branch 'master' of https://github.com/loclamor/ivvq13

Conflicts:
	cobertura.ser