trial type form created around included trial type

calling the function trialTiming() also moved to trial.php, rather than individual trial type files
Merge pull request #38 from TysonKerr/trialTypeChanges

trial type form created around included trial type