Added risk and action plan (1)
fixed
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
Merge branch 'master' of https://github.com/Contramalgra/java