Uploaded version 1.2. Created update to not use file I/O for parameters (v4.2.1) - this will not be used. Organised working directory further.
Merge branch 'master' of http://github.com/hariv1505/se3011_proj

Conflicts:
	Testing report brief rashim.docx