edited functions, added stuff
added security.php
.
Merge remote-tracking branch 'origin/master'