'commit1'
Merge branch 'master' of https://github.com/JSaintcross/CharisSecurityApp
added scaffolds