Reformatted trips form
Merge branch 'master' of https://github.com/GabrielleM/Yocona2