Working through alerts
Merge branch 'master' of github.com:Melindrea/security-application
Adjusting stuff