trial upload
Merge branch 'master' of https://github.com/trialadj/foal