Almost done with security
Merge branch 'master' of https://github.com/sklum/cse870