Calculated file names with paths in fileLocations
Merge branch 'master' into filepaths
shortened path names
Merge pull request #17 from TysonKerr/filepaths

Calculated file names with paths in fileLocations
Merge branch 'master' of https://github.com/TysonKerr/Collector into trialType-scan

Conflicts:
	Code/trial.php
adding comments

also added fileExists to arrayToLine