Added content to prestudy on methodology
Merge branch 'master' of https://github.com/kpro-gr10/report
Merge branch 'master' of https://github.com/kpro-gr10/report
Changes nonfunctional requirements
Changed non-functional requirements to quality requirement
because the quality requirements are used in the architecture
description.
Added content to tactis
changes main.tex
Changes
Merge branch 'master' of https://github.com/kpro-gr10/report

Conflicts:
	architecture/views.tex