about to work on template- join form working
Merge branch 'master' of https://github.com/makenai/heroschool-app
Merge branch 'master' of https://github.com/makenai/heroschool-app
commiting partial in case battery dies
Merge branch 'master' of https://github.com/makenai/heroschool-app