Added intro
Merge branch 'master' of https://github.com/kpro-gr10/report
Merge branch 'master' of https://github.com/kpro-gr10/report
Merge branch 'master' of https://github.com/kpro-gr10/report
Merge branch 'master' of https://github.com/kpro-gr10/report
Changed frontpage
Added content to user guide
Merge branch 'master' of https://github.com/kpro-gr10/report

Conflicts:
	phases/sprint4.tex