Manually merged changes from my personal branch with the current version of master branch. Git could not resolve conflicts autonomously.
Description of the functional requirements

This is a description of the functional requirements that will be needed
for the system. The Use case diagrams will be uploaded by tomorrow but I
can upload the vpp file separately for you all to look at
Diagrams Added

I added the Trial vpp diagrams for now just until I can get better
diagrams tomorrow.

Please look at the diagrams and comment... let me know if i've missed
something
Missing images

The missing pics included in the srs
Changed syntax in srs.tex, commented image include statements.
Changes to srs
Added high level use case diagram bac into document.
Merge branch 'master' into Tokologo

Conflicts:
	srs.tex

Fixed conflicts while performing Tokologo merge
Create person2.tex
Included person2's file

Added an include for person2.tex into the srs document
Use case prioritisation included
Fixed image placement
Commiting changes
Dummy change to merge to master
Use case prioritisation included
Fixed image placement
Dummy change to merge to master
Adde jpg files for class diagram and use case diagram. Added these figures to .tex as well.
upgraded pics without vp spam
new pics for lower level ucd