Revert "Added commented out mysql settings"

This reverts commit 9a49ea1305d11addea1c23df74e329467a04c55b.
Revert "Revert "Added commented out mysql settings""

This reverts commit 4c6f25cd6501e5a984f60244a9a1434d6c1a2afd.
test
Merge branch 'master' of https://github.com/wookoouk/Merit

Conflicts:
	start-80.sh