Merge branch 'master' of https://github.com/dylanmaryk/Cost-Time-Analysis

Conflicts:
	web/result.php
Fixed merge conflict.