Fixes in srs
fixed merge conflict
fixed conflict?
Merge branch 'master' of https://github.com/juanmaree/COS301-Group-8

Conflicts:
	person2.tex

Third time lucky