committing in order merge
Merge branch 'master' of https://github.com/danavery/trailsy

""
commiting before merge
Merge branch 'master' of https://github.com/danavery/trailsy
Merge branch 'master' of https://github.com/danavery/trailsy