configured settings
fixed configs
fixed merge conflicts
Merge branch 'master' of https://github.com/alanc93/wuhack
updated main layout