Merge pull request #1 from jacobg830/master

phpMyAdmin config and secret key generation