Added additional information on requirement categories
Resolved merge conflict with requirements Roel and me
Merge branch 'master' of https://github.com/Fingerpaint/project-docs