first commit
Merge https://github.com/Trifit/nwhs_app