Main and style changes
Merge branch 'master' of https://github.com/julianweisbord/fhsapp_v2