merge conflict
fixed merge conflicts
Merge branch 'master' of github.com:cpolitano/survival
css stuff
merge conflicts resolved
Merge branch 'jakecatt-map_fade_css'