initial commit from local dev to repo for both apps
Merge branch 'master' of https://github.com/hcavalle/server.client