schema conflict
typo fix
fix js typos
merge conflict
Merge branch 'master' of github.com:anniebae/wdi_the_nomads
Merge branch 'render_list'
trails to html
merge conflict
merge conflict
Merge branch 'master' of github.com:anniebae/wdi_the_nomads
new trails show up on submit