add
Merge branch 'master' of https://github.com/kpro-gr10/report
Sprint fix
Merge branch 'master' of https://github.com/kpro-gr10/report

Conflicts:
	phases/sprint4.tex