hopefully this works

fixed brokeness
Merge branch 'master' of github.com:davidwinters/The-War-Room