Alex
Merge branch 'master' of github.com:natalijk/SoftEng2013
Merge branch 'master' of github.com:natalijk/SoftEng2013

Conflicts:
	FinalReport.md
Merge branch 'master' of github.com:natalijk/SoftEng2013