Just getting up to date!
Merge branch 'postcodeform' of https://github.com/dylanmaryk/Cost-Time-Analysis into postcodeform

Conflicts:
	web/result.php
merged in form at bottom of page
Improving JSON for the Android app.
resolved conflict
resolved merge
Merge branch 'postcodeform'