untracked wp-config
Merging two separate brances

Merge branch 'master' of https://github.com/evanmac123/Eclub-website
test 2