test again
Merge branch 'feature/test' of https://github.com/Archi2013/ulaval-sports-tickets into feature/test

Conflicts:
	testOK