Merge pull request #1 from Contramalgra/patch-6

Added ICEpdf link

whatconfirm?
Added my picture
Added risk and action plan (1)
fixed
Merge pull request #43 from mabalaski/master

Thanks markus
Added my picture
Moved photo to new folder
Merge branch 'master' of https://github.com/Contramalgra/java
Merge branch 'patch-6' of github.com:itpun/java into itpun-patch-6

Conflicts:
	docs/deliverable1/planningDocument.tex
Merge pull request #45 from Contramalgra/master

Stephen's picture
Added Stephen's photo to the Planning Document
Added Risk User spec change

Added my risk with an action plan. The client decides to change what a user will be responsible for, like giving an Admin Assistant grading privileges.
Added Government/International Regulations Change

Might be too vague.
Also specified the table of contents depth.
Merge pull request #46 from graemesmth/patch-1

Added Risk User spec change
Merge pull request #47 from Contramalgra/patch-2

Added Government/International Regulations Change
Got in Graeme's Photo - Final tweaks
Quick change to Graeme's section