test line enabled
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
styleguide on staging
styleguide on staging
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
fix #929 - add transport constriction prompt and user information
for #928 - start implementing transport time (don't deploy)
added pry
fix #928 - transport time implemented
fixes for transport_time UI
add transport_time to mass upload docs